[Pkg-mediawiki-commits] r364 - in mediawiki-extensions/experimental/debian: . patches

[Thorsten Glaser]

Author: tg
Date: 2012-08-01 14:55:32 +0000 (Wed, 01 Aug 2012)
New Revision: 364

Modified:
   mediawiki-extensions/experimental/debian/changelog
   mediawiki-extensions/experimental/debian/patches/fix_rssreader.patch
Log:
Fix paths in RSS_Reader extension


Modified: mediawiki-extensions/experimental/debian/changelog
===================================================================
--- mediawiki-extensions/experimental/debian/changelog	2012-07-26 15:52:32 UTC (rev 363)
+++ mediawiki-extensions/experimental/debian/changelog	2012-08-01 14:55:32 UTC (rev 364)
@@ -1,3 +1,9 @@
+mediawiki-extensions (3~exp2~1) experimental; urgency=low
+
+  * Fix paths in RSS_Reader extension
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Wed, 01 Aug 2012 16:55:03 +0200
+
 mediawiki-extensions (3~exp1) experimental; urgency=low
 
   * Fix content-less ul element in Collection extension

Modified: mediawiki-extensions/experimental/debian/patches/fix_rssreader.patch
===================================================================
--- mediawiki-extensions/experimental/debian/patches/fix_rssreader.patch	2012-07-26 15:52:32 UTC (rev 363)
+++ mediawiki-extensions/experimental/debian/patches/fix_rssreader.patch	2012-08-01 14:55:32 UTC (rev 364)
@@ -4,6 +4,7 @@
 * set $egCache to false by default, since we have no www-data writable
   cache directory, and I don't think we want it
 * add $egCacheDir which can be overridden by people who like to cache
+* fix installation path
 * fix rendering path to CSS
 * fix id="RSSMainBody" being used multiple times by making it into
   a CSS class that can be used for styling RSS output instead
@@ -28,7 +29,12 @@
  	'author' => 'Artem Kaznatcheev',
  	'description' => 'Adds <tt><rss></tt> tag',
  	'url' => 'http://www.mediawiki.org/wiki/Extension:RSS_Reader'
-@@ -37,7 +38,8 @@ $egRSSReaderPath  = $wgScriptPath."/exte
+@@ -33,11 +34,12 @@ $wgExtensionCredits['parserhook'][] = ar
+ 
+ ### Global Variables ###
+ //path to follow for server scripts
+-$egRSSReaderPath  = $wgScriptPath."/extensions/RSSReader";
++$egRSSReaderPath  = $wgScriptPath."/extensions/RSS_Reader";
  $egCacheTime      = 3600; //default cache time in seconds
  $egCacheTimeMin   = 1800; //minimum cache time in seconds
  $egCacheTimeMax   = 7200; //maximum cache time in seconds
@@ -55,7 +61,7 @@
 +    $wgOut->addLink(array(
 +	'rel' => 'stylesheet',
 +	'type' => 'text/css',
-+	'href' => "egRSSReaderPath/RSSReader.css?$wgRSSReaderExtVersion",
++	'href' => "$egRSSReaderPath/RSSReader.css?$wgRSSReaderExtVersion",
 +    ));
  
      if (!$width) {