[Pkg-mediawiki-commits] r229 - mediawiki-extensions/trunk/debian/patches

[Thorsten Glaser]

Author: tg
Date: 2010-09-24 13:17:45 +0000 (Fri, 24 Sep 2010)
New Revision: 229

Modified:
   mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch
Log:
fix another PHP warning from production use


Modified: mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch	2010-09-07 09:07:17 UTC (rev 228)
+++ mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch	2010-09-24 13:17:45 UTC (rev 229)
@@ -99,7 +99,7 @@
              '<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	(revision 227)
 +++ 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()
@@ -118,6 +118,15 @@
  						// convert lastBuildDate to specified date format
  						$result['lastBuildDate'] = date($this->date_format, $timestamp);
  			}
+@@ -198,7 +198,7 @@
+ 					if ($this->stripHTML && $result['items'][$i]['title'])
+ 						$result['items'][$i]['title'] = strip_tags($this->unhtmlentities(strip_tags($result['items'][$i]['title'])));
+ 					// If date_format is specified and pubDate is valid
+-					if ($this->date_format != '' && ($timestamp = strtotime($result['items'][$i]['pubDate'])) !==-1) {
++					if ($this->date_format != '' && isset($result['items'][$i]['pubDate']) && ($timestamp = strtotime($result['items'][$i]['pubDate'])) !== -1) {
+ 						// convert pubDate to specified date format
+ 						$result['items'][$i]['pubDate'] = 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 @@