diff --git a/wp-includes/feed-atom.php b/wp-includes/feed-atom.php index 6f2d5f7e8d..be0be78b1e 100644 --- a/wp-includes/feed-atom.php +++ b/wp-includes/feed-atom.php @@ -11,7 +11,7 @@ $more = 1; xml:base="<?php bloginfo_rss('home') ?>/wp-atom.php" <?php do_action('atom_ns'); ?> > - <title type="text"><?php bloginfo_rss('name') ?></title> + <title type="text"><?php bloginfo_rss('name'); wp_title_rss(); ?></title> <subtitle type="text"><?php bloginfo_rss("description") ?></subtitle> <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT')); ?></updated> diff --git a/wp-includes/feed-rdf.php b/wp-includes/feed-rdf.php index 80b1d6d0b5..d1ac458956 100644 --- a/wp-includes/feed-rdf.php +++ b/wp-includes/feed-rdf.php @@ -15,7 +15,7 @@ $more = 1; <?php do_action('rdf_ns'); ?> > <channel rdf:about="<?php bloginfo_rss("url") ?>"> - <title><?php bloginfo_rss('name') ?></title> + <title><?php bloginfo_rss('name'); wp_title_rss(); ?></title> <link><?php bloginfo_rss('url') ?></link> <description><?php bloginfo_rss('description') ?></description> <dc:date><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></dc:date> diff --git a/wp-includes/feed-rss.php b/wp-includes/feed-rss.php index 97e06105c6..91b2c131f0 100644 --- a/wp-includes/feed-rss.php +++ b/wp-includes/feed-rss.php @@ -7,7 +7,7 @@ $more = 1; <!-- generator="wordpress/<?php echo $wp_version ?>" --> <rss version="0.92"> <channel> - <title><?php bloginfo_rss('name') ?></title> + <title><?php bloginfo('name'); wp_title_rss(); ?></title> <link><?php bloginfo_rss('url') ?></link> <description><?php bloginfo_rss('description') ?></description> <lastBuildDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), false); ?></lastBuildDate> diff --git a/wp-includes/feed-rss2.php b/wp-includes/feed-rss2.php index 03711df845..588a063a54 100644 --- a/wp-includes/feed-rss2.php +++ b/wp-includes/feed-rss2.php @@ -14,7 +14,7 @@ $more = 1; > <channel> - <title><?php bloginfo_rss('name'); ?></title> + <title><?php bloginfo_rss('name'); wp_title_rss(); ?></title> <link><?php bloginfo_rss('url') ?></link> <description><?php bloginfo_rss("description") ?></description> <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), false); ?></pubDate> diff --git a/wp-includes/feed.php b/wp-includes/feed.php index c0c8cb17c0..939808f141 100644 --- a/wp-includes/feed.php +++ b/wp-includes/feed.php @@ -16,6 +16,10 @@ function get_wp_title_rss($sep = '»') { return $title; } +function wp_title_rss($sep = '»') { + echo apply_filters('wp_title_rss', get_wp_title_rss($sep)); +} + function get_the_title_rss() { $title = get_the_title(); $title = apply_filters('the_title', $title); diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index a50f479493..dd5956d35f 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -165,6 +165,7 @@ function wp_title($sep = '»', $display = true) { $author = get_query_var('author'); $author_name = get_query_var('author_name'); $m = get_query_var('m'); + print '<!-- $m = ' . $m . ' -->'; $year = get_query_var('year'); $monthnum = get_query_var('monthnum'); $day = get_query_var('day');