Formatting cleanup and added category-123.php functionality.
git-svn-id: http://svn.automattic.com/wordpress/trunk@2038 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
22fb2efc85
commit
73fd50000e
|
@ -6,7 +6,7 @@ if ( !file_exists( dirname(__FILE__) . '/wp-config.php') )
|
||||||
|
|
||||||
require_once( dirname(__FILE__) . '/wp-config.php');
|
require_once( dirname(__FILE__) . '/wp-config.php');
|
||||||
|
|
||||||
require_once( dirname(__FILE__) . '/wp-includes/wp-l10n.php');
|
require_once( ABSPATH . '/wp-includes/wp-l10n.php');
|
||||||
|
|
||||||
$query_vars = array();
|
$query_vars = array();
|
||||||
|
|
||||||
|
@ -103,18 +103,17 @@ for ($i=0; $i<count($wpvarstoreset); $i += 1) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ('' != $feed) {
|
if ( '' != $feed )
|
||||||
$doing_rss = true;
|
$doing_rss = true;
|
||||||
}
|
|
||||||
|
|
||||||
if (is_trackback()) {
|
|
||||||
|
if ( is_trackback() )
|
||||||
$doing_trackback = true;
|
$doing_trackback = true;
|
||||||
}
|
|
||||||
|
|
||||||
// Sending HTTP headers
|
// Sending HTTP headers
|
||||||
|
|
||||||
if ( is_404() ) {
|
if ( is_404() ) {
|
||||||
header("HTTP/1.x 404 Not Found");
|
header('HTTP/1.x 404 Not Found');
|
||||||
} else if ( !isset($doing_rss) || !$doing_rss ) {
|
} else if ( !isset($doing_rss) || !$doing_rss ) {
|
||||||
@header('X-Pingback: '. get_bloginfo('pingback_url'));
|
@header('X-Pingback: '. get_bloginfo('pingback_url'));
|
||||||
} else {
|
} else {
|
||||||
|
@ -196,7 +195,7 @@ if ( (0 == count($posts)) && !is_404() && !is_search()
|
||||||
&& !empty($_SERVER['QUERY_STRING']) &&
|
&& !empty($_SERVER['QUERY_STRING']) &&
|
||||||
(false === strpos($_SERVER['REQUEST_URI'], '?')) ) {
|
(false === strpos($_SERVER['REQUEST_URI'], '?')) ) {
|
||||||
$wp_query->is_404 = true;
|
$wp_query->is_404 = true;
|
||||||
header("HTTP/1.x 404 Not Found");
|
header('HTTP/1.x 404 Not Found');
|
||||||
}
|
}
|
||||||
|
|
||||||
$wp_did_header = true;
|
$wp_did_header = true;
|
||||||
|
@ -210,52 +209,45 @@ if ($pagenow == 'index.php') {
|
||||||
$wp_did_template_redirect = true;
|
$wp_did_template_redirect = true;
|
||||||
do_action('template_redirect', '');
|
do_action('template_redirect', '');
|
||||||
if ( is_feed() ) {
|
if ( is_feed() ) {
|
||||||
include(dirname(__FILE__) . '/wp-feed.php');
|
include(ABSPATH . '/wp-feed.php');
|
||||||
exit;
|
exit;
|
||||||
} else if ( is_trackback() ) {
|
} else if ( is_trackback() ) {
|
||||||
include(dirname(__FILE__) . '/wp-trackback.php');
|
include(ABSPATH . '/wp-trackback.php');
|
||||||
exit;
|
exit;
|
||||||
} else if (is_404() &&
|
} else if ( is_404() && file_exists("$wp_template_dir/404.php") ) {
|
||||||
file_exists("$wp_template_dir/404.php")) {
|
|
||||||
include("$wp_template_dir/404.php");
|
include("$wp_template_dir/404.php");
|
||||||
exit;
|
exit;
|
||||||
} else if (is_home() &&
|
} else if ( is_home() && file_exists("$wp_template_dir/index.php") ) {
|
||||||
file_exists("$wp_template_dir/index.php")) {
|
|
||||||
include("$wp_template_dir/index.php");
|
include("$wp_template_dir/index.php");
|
||||||
exit;
|
exit;
|
||||||
} else if (is_single() &&
|
} else if ( is_single() && file_exists("$wp_template_dir/single.php") ) {
|
||||||
file_exists("$wp_template_dir/single.php")) {
|
|
||||||
include("$wp_template_dir/single.php");
|
include("$wp_template_dir/single.php");
|
||||||
exit;
|
exit;
|
||||||
} else if ( is_page() && file_exists(get_page_template()) ) {
|
} else if ( is_page() && file_exists(get_page_template()) ) {
|
||||||
include(get_page_template());
|
include(get_page_template());
|
||||||
exit;
|
exit;
|
||||||
} else if (is_category() &&
|
} else if ( is_category() && file_exists("$wp_template_dir/category-" . get_query_var('cat') . '.php') ) {
|
||||||
file_exists("$wp_template_dir/category.php")) {
|
include("$wp_template_dir/category" . get_query_var('cat') . '.php');
|
||||||
|
exit;
|
||||||
|
} else if ( is_category() && file_exists("$wp_template_dir/category.php") ) {
|
||||||
include("$wp_template_dir/category.php");
|
include("$wp_template_dir/category.php");
|
||||||
exit;
|
exit;
|
||||||
} else if (is_author() &&
|
} else if ( is_author() && file_exists("$wp_template_dir/author.php") ) {
|
||||||
file_exists("$wp_template_dir/author.php")) {
|
|
||||||
include("$wp_template_dir/author.php");
|
include("$wp_template_dir/author.php");
|
||||||
exit;
|
exit;
|
||||||
} else if (is_date() &&
|
} else if ( is_date() && file_exists("$wp_template_dir/date.php") ) {
|
||||||
file_exists("$wp_template_dir/date.php")) {
|
|
||||||
include("$wp_template_dir/date.php");
|
include("$wp_template_dir/date.php");
|
||||||
exit;
|
exit;
|
||||||
} else if (is_archive() &&
|
} else if ( is_archive() && file_exists("$wp_template_dir/archive.php") ) {
|
||||||
file_exists("$wp_template_dir/archive.php")) {
|
|
||||||
include("$wp_template_dir/archive.php");
|
include("$wp_template_dir/archive.php");
|
||||||
exit;
|
exit;
|
||||||
} else if (is_search() &&
|
} else if ( is_search() && file_exists("$wp_template_dir/search.php") ) {
|
||||||
file_exists("$wp_template_dir/search.php")) {
|
|
||||||
include("$wp_template_dir/search.php");
|
include("$wp_template_dir/search.php");
|
||||||
exit;
|
exit;
|
||||||
} else if (is_paged() &&
|
} else if ( is_paged() && file_exists("$wp_template_dir/paged.php") ) {
|
||||||
file_exists("$wp_template_dir/paged.php")) {
|
|
||||||
include("$wp_template_dir/paged.php");
|
include("$wp_template_dir/paged.php");
|
||||||
exit;
|
exit;
|
||||||
} else if (file_exists("$wp_template_dir/index.php"))
|
} else if ( file_exists("$wp_template_dir/index.php") ) {
|
||||||
{
|
|
||||||
include("$wp_template_dir/index.php");
|
include("$wp_template_dir/index.php");
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue