diff --git a/wp-app.php b/wp-app.php
index 6504d7080b..88938c2f6c 100644
--- a/wp-app.php
+++ b/wp-app.php
@@ -1096,7 +1096,6 @@ EOD;
Copyright
-
'
-
diff --git a/wp-includes/feed-atom.php b/wp-includes/feed-atom.php
index e08ba658f4..cce1cbfb77 100644
--- a/wp-includes/feed-atom.php
+++ b/wp-includes/feed-atom.php
@@ -20,7 +20,6 @@ echo ''; ?>
-
diff --git a/wp-includes/feed-rdf.php b/wp-includes/feed-rdf.php
index 5a7b694492..3a0daf1fd6 100644
--- a/wp-includes/feed-rdf.php
+++ b/wp-includes/feed-rdf.php
@@ -23,7 +23,6 @@ echo ''; ?>
-
2000-01-01T12:00+00:00
diff --git a/wp-includes/feed-rss.php b/wp-includes/feed-rss.php
index 90eeab05e1..b26897d3e6 100644
--- a/wp-includes/feed-rss.php
+++ b/wp-includes/feed-rss.php
@@ -9,7 +9,6 @@ header('Content-Type: ' . feed_content_type('rss-http') . '; charset=' . get_opt
$more = 1;
echo ''; ?>
-
diff --git a/wp-includes/feed-rss2-comments.php b/wp-includes/feed-rss2-comments.php
index 8232a0f174..74715b80e1 100644
--- a/wp-includes/feed-rss2-comments.php
+++ b/wp-includes/feed-rss2-comments.php
@@ -29,7 +29,6 @@ echo '';
-
diff --git a/wp-includes/feed-rss2.php b/wp-includes/feed-rss2.php
index 12286da287..e97ddd5b98 100644
--- a/wp-includes/feed-rss2.php
+++ b/wp-includes/feed-rss2.php
@@ -26,7 +26,6 @@ echo ''; ?>
-
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index f6fc51af31..545c780bdf 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -2130,8 +2130,34 @@ function the_generator( $type ) {
* @param string $type The type of generator to return - (html|xhtml|atom|rss2|rdf|comment|export).
* @return string The HTML content for the generator.
*/
-function get_the_generator( $type ) {
- switch ($type) {
+function get_the_generator( $type = '' ) {
+ if ( empty( $type ) ) {
+
+ $current_filter = current_filter();
+ if ( empty( $current_filter ) )
+ return;
+
+ switch ( $current_filter ) {
+ case 'rss2_head' :
+ case 'commentsrss2_head' :
+ $type = 'rss2';
+ break;
+ case 'rss_head' :
+ case 'opml_head' :
+ $type = 'comment';
+ break;
+ case 'rdf_header' :
+ $type = 'rdf';
+ break;
+ case 'atom_head' :
+ case 'comments_atom_head' :
+ case 'app_head' :
+ $type = 'atom';
+ break;
+ }
+ }
+
+ switch ( $type ) {
case 'html':
$gen = '';
break;
diff --git a/wp-links-opml.php b/wp-links-opml.php
index e033d4989f..8f80403758 100644
--- a/wp-links-opml.php
+++ b/wp-links-opml.php
@@ -26,11 +26,11 @@ if ((empty ($link_cat)) || ($link_cat == 'all') || ($link_cat == '0')) {
$link_cat = intval($link_cat);
}
?>\n"; ?>
-
Links for
GMT
+