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

This commit is contained in:
Grischa Brockhaus 2007-07-29 10:11:53 +00:00
parent 0c94c97b34
commit 833a7e9177
2 changed files with 0 additions and 16 deletions

View File

@ -3,11 +3,6 @@
Version 1.3 () 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 * The recent entries sidebar plugin shiped with s9y listed entries
not accessable by the current user because of right restrictions. not accessable by the current user because of right restrictions.
(brockhaus) (brockhaus)

View File

@ -133,16 +133,10 @@ function serendipity_printEntries_rss(&$entries, $version, $comments = false, $f
case 'atom0.3': case 'atom0.3':
$entry_hook = 'frontend_display:atom-0.3:per_entry'; $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; break;
case 'atom1.0': case 'atom1.0':
$entry_hook = 'frontend_display:atom-1.0:per_entry'; $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; break;
} }
@ -152,8 +146,3 @@ function serendipity_printEntries_rss(&$entries, $version, $comments = false, $f
} }
} }
function _hrefsrcEntityReplacer($treffer){
return $treffer[1] . '="' . htmlspecialchars($treffer[2]) . '"';
}