[Pkg-mediawiki-commits] r203 - in mediawiki-extensions/trunk/debian: . patches

[Thorsten Glaser]

Author: tg
Date: 2010-07-28 10:01:37 +0000 (Wed, 28 Jul 2010)
New Revision: 203

Modified:
   mediawiki-extensions/trunk/debian/changelog
   mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch
Log:
two <rss/> in one MW page led to a validity error, fixed now


Modified: mediawiki-extensions/trunk/debian/changelog
===================================================================
--- mediawiki-extensions/trunk/debian/changelog	2010-07-28 09:53:24 UTC (rev 202)
+++ mediawiki-extensions/trunk/debian/changelog	2010-07-28 10:01:37 UTC (rev 203)
@@ -1,8 +1,9 @@
-mediawiki-extensions (2.4~beta+1) UNRELEASED; urgency=low
+mediawiki-extensions (2.4~beta+2) UNRELEASED; urgency=low
 
   * Fix a few extensions’ bugs to achieve XHTML validity
+  * Make id attributes unique in RSS_Reader
 
- -- Thorsten Glaser <tg at mirbsd.de>  Fri, 16 Jul 2010 17:05:31 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Wed, 28 Jul 2010 12:01:02 +0200
 
 mediawiki-extensions (2.3) unstable; urgency=low
 

Modified: mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch	2010-07-28 09:53:24 UTC (rev 202)
+++ mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch	2010-07-28 10:01:37 UTC (rev 203)
@@ -5,6 +5,8 @@
   cache directory, and I don't think we want it
 * add $egCacheDir which can be overridden by people who like to cache
 * 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
 * make work with PHP 5.3
 * XHTML/1.0 Transitional validity of output
 
@@ -49,7 +51,7 @@
      $egCacheTimeMax, $egCache, $rssType, $egNoFollow, $egWidthMin,
      $egWidthMax;
  
-@@ -152,12 +155,15 @@
+@@ -152,17 +155,20 @@
        if ($argv["title"]=="off") $dispTitle = false;
      }
  
@@ -64,10 +66,16 @@
      if (!$width) {
        $output = '
 -        <table  style="background: inherit;"; id="RSSMainBody">
-+        <table style="background: inherit;" id="RSSMainBody">
++        <table class="RSSMainBody" style="background:inherit;">
          <tr>
        ';
      } else {
+       $output = '
+-        <table id="RSSMainBody" style="background: inherit;float:right;width:'.$width.'">
++        <table class="RSSMainBody" style="background:inherit; float:right; width:'.$width.'">
+         <tr>
+       ';
+     }
 @@ -173,8 +179,8 @@
      // Create cURLRSS or wikiRSS or lastRSS object
      $rss = new $rssType; //initialize an object of rssType