From 5b446f7cf738ff1fe9b4778d28e0afa40a0057f8 Mon Sep 17 00:00:00 2001
From: rob1n <rob1n@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 29 Mar 2007 01:29:09 +0000
Subject: [PATCH] Show more relevant titles (current category, date, etc.) in
 feed titles. fixes #1790

git-svn-id: http://svn.automattic.com/wordpress/trunk@5132 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/feed-atom.php        | 2 +-
 wp-includes/feed-rdf.php         | 2 +-
 wp-includes/feed-rss.php         | 2 +-
 wp-includes/feed-rss2.php        | 2 +-
 wp-includes/feed.php             | 4 ++++
 wp-includes/general-template.php | 1 +
 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/wp-includes/feed-atom.php b/wp-includes/feed-atom.php
index 6f2d5f7e8..be0be78b1 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 80b1d6d0b..d1ac45895 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 97e06105c..91b2c131f 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 03711df84..588a063a5 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 c0c8cb17c..939808f14 100644
--- a/wp-includes/feed.php
+++ b/wp-includes/feed.php
@@ -16,6 +16,10 @@ function get_wp_title_rss($sep = '&#187;') {
 	return $title;
 }
 
+function wp_title_rss($sep = '&#187;') {
+	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 a50f47949..dd5956d35 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -165,6 +165,7 @@ function wp_title($sep = '&raquo;', $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');