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

[Thorsten Glaser]

Author: tg
Date: 2010-07-28 10:41:43 +0000 (Wed, 28 Jul 2010)
New Revision: 204

Modified:
   mediawiki-extensions/trunk/debian/changelog
   mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch
Log:
fix more PHP warnings and a bug: somehow, the parenthes?\196?\147s around
	if (($rssArray = $rss->get($field)) && ?\226?\128?\166
are needed, but idk why; the lastRSS changes are, in this order:
?\226?\128?\162 php?\226?\128?\153s pcre functions fail if ungreedy is selected but the string
  to work on too large or something; since there?\226?\128?\153s only one channel
  in an RSS normally, this doesn?\226?\128?\153t hurt (otherwise, one could use
  substring functions to take the first one)
?\226?\128?\162 php warning fix


Modified: mediawiki-extensions/trunk/debian/changelog
===================================================================
--- mediawiki-extensions/trunk/debian/changelog	2010-07-28 10:01:37 UTC (rev 203)
+++ mediawiki-extensions/trunk/debian/changelog	2010-07-28 10:41:43 UTC (rev 204)
@@ -1,9 +1,9 @@
 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
+  * Make id attributes unique in RSS_Reader and fix warnings
 
- -- Thorsten Glaser <tg at mirbsd.de>  Wed, 28 Jul 2010 12:01:02 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Wed, 28 Jul 2010 12:40:18 +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 10:01:37 UTC (rev 203)
+++ mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch	2010-07-28 10:41:43 UTC (rev 204)
@@ -9,13 +9,14 @@
   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
+* fix a bunch of PHP warnings
 
 Also add documentation of these changes as README.Debian and point to
 upstream's documentation in form of a wikipage.
 
 Index: mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php
 ===================================================================
---- mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php	(revision 200)
+--- mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php	(revision 202)
 +++ mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/RSSReader.php	(working copy)
 @@ -22,10 +22,11 @@
  }
@@ -92,10 +93,31 @@
        //table cell that contains a single RSS feed
        $output .= '<td valign="top" style="width: '.$width.'%;">';
 -      if ($rssArray = $rss->get($field)){
-+      if ($rssArray = $rss->get($field) && (isset($rssArray['link']) || isset($rssArray['title']) || isset($rssArray['description']))) {
++      if (($rssArray = $rss->get($field)) && (isset($rssArray['link']) || isset($rssArray['title']) || isset($rssArray['description']))) {
          if ($dispTitle) { //check if title should be displayed
            $output .=
              '<div class="RSSReader-head">'.
+Index: mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/lastRSS.php
+===================================================================
+--- mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/lastRSS.php	(revision 202)
++++ mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/RSS_Reader/lastRSS.php	(working copy)
+@@ -149,14 +149,14 @@
+ 				{ $this->rsscp = $this->default_cp; } // This is used in my_preg_match()
+ 
+ 			// Parse CHANNEL info
+-			preg_match("'<channel.*?>(.*?)</channel>'si", $rss_content, $out_channel);
++			preg_match("'<channel.*?>(.*)</channel>'si", $rss_content, $out_channel);
+ 			foreach($this->channeltags as $channeltag)
+ 			{
+ 				$temp = $this->my_preg_match("'<$channeltag.*?>(.*?)</$channeltag>'si", $out_channel[1]);
+ 				if ($temp != '') $result[$channeltag] = $temp; // Set only if not empty
+ 			}
+ 			// If date_format is specified and lastBuildDate is valid
+-			if ($this->date_format != '' && ($timestamp = strtotime($result['lastBuildDate'])) !==-1) {
++			if ($this->date_format != '' && isset($result['lastBuildDate']) && ($timestamp = strtotime($result['lastBuildDate'])) !==-1) {
+ 						// convert lastBuildDate to specified date format
+ 						$result['lastBuildDate'] = date($this->date_format, $timestamp);
+ 			}
 --- /dev/null
 +++ mediawiki-extensions-2.3/dist/mediawiki-extensions-base/usr/share/doc/mediawiki-extensions/base/RSS_Reader/README.Debian	2010-06-25 15:44:30.000000000 +0200
 @@ -0,0 +1,10 @@