Changeset 2272

Show
Ignore:
Timestamp:
02/11/05 06:42:07 (4 years ago)
Author:
rboren
Message:

Make sure is_feed() is true when feed files are referenced directly. http://mosquito.wordpress.org/view.php?id=726

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-atom.php

    r2131 r2272  
    33if (empty($feed)) { 
    44    $blog = 1; 
     5        $feed = 'atom'; 
    56    $doing_rss = 1; 
    67    require('wp-blog-header.php'); 

  • trunk/wp-blog-header.php

    r2185 r2272  
    102102} 
    103103 
    104 if ( '' != $feed ) 
    105     $doing_rss = true; 
    106  
    107  
    108104if ( is_trackback() ) 
    109105    $doing_trackback = true; 
    …… 
    113109if ( is_404() ) { 
    114110    header('HTTP/1.x 404 Not Found'); 
    115 } else if ( !isset($doing_rss) || !$doing_rss ) { 
     111} else if ( !is_feed() ) { 
    116112    @header('X-Pingback: '. get_bloginfo('pingback_url')); 
    117113} else { 
    …… 
    208204        // should be skipped for everything except feeds and trackbacks. 
    209205        $wp_template_redirect = true; 
    210         if ( is_feed() ) { 
     206        if ( is_feed() && empty($doing_rss) ) { 
    211207            include(ABSPATH . '/wp-feed.php'); 
    212208            exit; 
    …… 
    218214        $wp_template_redirect = true; 
    219215        do_action('template_redirect'); 
    220         if ( is_feed() ) { 
     216        if ( is_feed() && empty($doing_rss) ) { 
    221217            include(ABSPATH . '/wp-feed.php'); 
    222218            exit; 

  • trunk/wp-commentsrss2.php

    r2251 r2272  
    11<?php  
    22if ( empty($feed) ) { 
     3    $feed = 'rss2'; 
    34    $withcomments = 1; 
     5    $doing_rss = 1; 
    46    require('wp-blog-header.php'); 
    57} 

  • trunk/wp-feed.php

    r1892 r2272  
    1010 
    1111if ($feed == '' || $feed == 'feed') { 
    12     // TODO:  Get default feed from options DB. 
    1312    $feed = 'rss2'; 
    1413} 

  • trunk/wp-rdf.php

    r2240 r2272  
    33if (empty($feed)) { 
    44    $blog = 1; // enter your blog's ID 
     5        $feed = 'rdf'; 
    56    $doing_rss = 1; 
    67    require('wp-blog-header.php'); 

  • trunk/wp-rss.php

    r2131 r2272  
    33if (empty($feed)) { 
    44    $blog = 1; 
     5        $feed = 'rss'; 
    56    $doing_rss = 1; 
    67    require('wp-blog-header.php'); 

  • trunk/wp-rss2.php

    r2252 r2272  
    33if (empty($feed)) { 
    44    $blog = 1; 
     5    $feed = 'rss2'; 
    56    $doing_rss = 1; 
    67    require('wp-blog-header.php');