Changeset 1641

Show
Ignore:
Timestamp:
09/13/04 07:28:16 (4 years ago)
Author:
rboren
Message:

Template redirection fix-up.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-blog-header.php

    r1638 r1641  
    206206    file_exists(ABSPATH . "wp-content/${wp_template}index.php")) { 
    207207  $wp_did_home = true; 
     208    $wp_did_template_redirect = true; 
    208209  include(ABSPATH . "wp-content/${wp_template}index.php"); 
    209210  exit; 
    …… 
    211212    file_exists(ABSPATH . "wp-content/${wp_template}single.php")) { 
    212213  $wp_did_single = true; 
     214    $wp_did_template_redirect = true; 
    213215  include(ABSPATH . "wp-content/${wp_template}single.php"); 
    214216  exit; 
    …… 
    216218        file_exists(ABSPATH . "wp-content/${wp_template}page.php")) { 
    217219  $wp_did_page = true; 
     220    $wp_did_template_redirect = true; 
    218221  include(ABSPATH . "wp-content/${wp_template}page.php"); 
    219222  exit; 
    …… 
    221224       file_exists(ABSPATH . "wp-content/${wp_template}category.php")) { 
    222225  $wp_did_category = true; 
     226    $wp_did_template_redirect = true; 
    223227  include(ABSPATH . "wp-content/${wp_template}category.php"); 
    224228  exit; 
    …… 
    226230       file_exists(ABSPATH . "wp-content/${wp_template}author.php")) { 
    227231  $wp_did_author = true; 
     232    $wp_did_template_redirect = true; 
    228233  include(ABSPATH . "wp-content/${wp_template}author.php"); 
    229234  exit; 
    …… 
    231236       file_exists(ABSPATH . "wp-content/${wp_template}date.php")) { 
    232237  $wp_did_date = true; 
     238    $wp_did_template_redirect = true; 
    233239  include(ABSPATH . "wp-content/${wp_template}date.php"); 
    234240  exit; 
    …… 
    236242       file_exists(ABSPATH . "wp-content/${wp_template}archive.php")) { 
    237243  $wp_did_archive = true; 
     244    $wp_did_template_redirect = true; 
    238245  include(ABSPATH . "wp-content/${wp_template}archive.php"); 
    239246  exit; 
    …… 
    241248       file_exists(ABSPATH . "wp-content/${wp_template}search.php")) { 
    242249  $wp_did_search = true; 
     250    $wp_did_template_redirect = true; 
    243251  include(ABSPATH . "wp-content/${wp_template}search.php"); 
    244252  exit; 
    …… 
    246254       file_exists(ABSPATH . "wp-content/${wp_template}404.php")) { 
    247255  $wp_did_404 = true; 
     256    $wp_did_template_redirect = true; 
    248257  include(ABSPATH . "wp-content/${wp_template}404.php"); 
    249258  exit; 
    250259} else if (is_feed() && $pagenow != 'wp-feed.php') { 
     260    $wp_did_template_redirect = true; 
    251261  include(dirname(__FILE__) . '/wp-feed.php'); 
    252262  exit; 
    253263} else if ($pagenow != 'wp-trackback.php' && $tb == 1) { 
     264    $wp_did_template_redirect = true; 
    254265  include(dirname(__FILE__) . '/wp-trackback.php'); 
    255266  exit; 
    256 } else if ((! isset($wp_did_home)) && file_exists(ABSPATH . "wp-content/${wp_template}index.php")) 
     267} else if ((! isset($wp_did_template_redirect)) && file_exists(ABSPATH . "wp-content/${wp_template}index.php")) 
    257268{ 
    258269    $wp_did_home = true; 
     270    $wp_did_template_redirect = true; 
    259271    include(ABSPATH . "wp-content/${wp_template}index.php"); 
    260272    exit;