diff -Nru mediawiki-extensions-2.4/debian/changelog mediawiki-extensions-2.5/debian/changelog --- mediawiki-extensions-2.4/debian/changelog 2011-04-18 11:55:10.000000000 +0000 +++ mediawiki-extensions-2.5/debian/changelog 2012-02-01 15:29:45.000000000 +0000 @@ -1,3 +1,11 @@ +mediawiki-extensions (2.5) unstable; urgency=low + + * Disable the News extension hooking into the output of all and + any RSS/Atom feeds, as this broke e.g. history feeds + (Evolvis [#2557] and [#2558]) + + -- Thorsten Glaser Wed, 01 Feb 2012 16:28:00 +0100 + mediawiki-extensions (2.4) unstable; urgency=low * Fix a few extensions’ bugs to achieve XHTML validity diff -Nru mediawiki-extensions-2.4/debian/patches/news_dont_break_feeds.patch mediawiki-extensions-2.5/debian/patches/news_dont_break_feeds.patch --- mediawiki-extensions-2.4/debian/patches/news_dont_break_feeds.patch 1970-01-01 00:00:00.000000000 +0000 +++ mediawiki-extensions-2.5/debian/patches/news_dont_break_feeds.patch 2012-02-01 15:29:45.000000000 +0000 @@ -0,0 +1,24 @@ +$Id: news_dont_break_feeds.patch 305 2012-02-01 15:29:45Z tg $ + +Unbreak RSS links generated by other things than the News extension +itself, such as those on the &action=history pages. The cost of this +is that the newly introduced (by this extension) tag does +no longer work, but that’s no regression… + +Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/News/News.php +=================================================================== +--- trunk.orig/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/News/News.php 2012-02-01 16:25:15.000000000 +0100 ++++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/News/News.php 2012-02-01 16:26:13.000000000 +0100 +@@ -36,7 +36,11 @@ + $wgAutoloadClasses['NewsRenderer'] = dirname( __FILE__ ) . '/NewsRenderer.php'; + $wgAutoloadClasses['NewsFeedPage'] = dirname( __FILE__ ) . '/NewsRenderer.php'; + $wgHooks['ArticleFromTitle'][] = 'wfNewsArticleFromTitle'; +-$wgHooks['SkinTemplateOutputPageBeforeExec'][] = 'wfNewsSkinTemplateOutputPageBeforeExec'; ++/*- ++ * disabled to not break page feeds from other sources ++ * cf. https://evolvis.org/tracker/t_follow.php/2557 ++ */ ++//$wgHooks['SkinTemplateOutputPageBeforeExec'][] = 'wfNewsSkinTemplateOutputPageBeforeExec'; + + //FIXME: find a way to override the feed URLs generated by OutputPage::getHeadLinks + diff -Nru mediawiki-extensions-2.4/debian/patches/series mediawiki-extensions-2.5/debian/patches/series --- mediawiki-extensions-2.4/debian/patches/series 2011-04-12 12:32:36.000000000 +0000 +++ mediawiki-extensions-2.5/debian/patches/series 2012-02-01 15:29:45.000000000 +0000 @@ -8,3 +8,4 @@ fix_rssreader.patch fix_interwiki.patch fix_ldapauth.patch +news_dont_break_feeds.patch