Reverted last patch for making Atom Feed working with parameterized URLs.

diff --git a/docs/NEWS b/docs/NEWS
index a66be57356fddc145bbf167fc673879b3ed4fbf3..22aa352b280b8c22f4645c3b7266622a47b181d4 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,11 +3,6 @@
 Version 1.3 ()
 ------------------------------------------------------------------------
 
-    * Atom feeds became invalid, if entry has href or src attributes 
-      containing char represented by XML Entities normaly 
-      (like href="test.de?a=1&b=2")
-      (brockhaus)
-
     * The recent entries sidebar plugin shiped with s9y listed entries
       not accessable by the current user because of right restrictions.
       (brockhaus)

diff --git a/include/functions_rss.inc.php b/include/functions_rss.inc.php
index 28e09c6338e6e35e4a266a6b58e5a32e52a92a33..4ec3a1afb1d684658e770dda865da1b68443d171 100644 (file)
--- a/include/functions_rss.inc.php
+++ b/include/functions_rss.inc.php
@@ -133,16 +133,10 @@ function serendipity_printEntries_rss(&$entries, $version, $comments = false, $f
 
                 case 'atom0.3':
                     $entry_hook = 'frontend_display:atom-0.3:per_entry';
-                    $hrefPattern    = '@(href|src)\s*?="(.*?)"@si';
-                    $entry['feed_body'] = preg_replace_callback($hrefPattern, _hrefsrcEntityReplacer, $entry['feed_body']);
-                    $entry['feed_ext'] = preg_replace_callback($hrefPattern, _hrefsrcEntityReplacer, $entry['feed_ext']);
                     break;
 
                 case 'atom1.0':
                     $entry_hook     = 'frontend_display:atom-1.0:per_entry';
-                    $hrefPattern    = '@(href|src)\s*?="(.*?)"@si';
-                    $entry['feed_body'] = preg_replace_callback($hrefPattern, _hrefsrcEntityReplacer, $entry['feed_body']);
-                    $entry['feed_ext'] = preg_replace_callback($hrefPattern, _hrefsrcEntityReplacer, $entry['feed_ext']);
                     break;
             }
 
@@ -152,8 +146,3 @@ function serendipity_printEntries_rss(&$entries, $version, $comments = false, $f
     }
     
 }
-
-function _hrefsrcEntityReplacer($treffer){
-    return $treffer[1] . '="' . htmlspecialchars($treffer[2]) . '"';    
-}
-