wikimedia/mediawiki-extensions-RSS
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/RSS synced 2024-11-13 17:57:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug 55763

Browse source 
Change-Id: I4329c4e652f3025ddcca4bcd38dedc33b1a378a6
This commit is contained in:
Wikinaut 2013-10-17 23:37:46 +02:00
parent 41f37e726e
commit b1f1e0b517
4 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
RELEASE-NOTES
View file

@ -1,6 +1,6 @@
RELEASE NOTES of the MediaWiki extension RSS
Version 2.23 20130903
Version 2.24 20131017
Manual http://www.mediawiki.org/wiki/Extension:RSS
@ -27,6 +27,9 @@ git clone https://gerrit.wikimedia.org/r/p/mediawiki/extensions/RSS.git
The length limitation must be HTML tag-safe, but it is not at the moment.
Length limitation is disabled by default.
=== Version 2.24 2013-10-17 ==
* fix for Bug 55763 Undefined variable: txt in RSSParser.php on line 376
=== Version 2.23 2013-09-03 ===
* Fix parsing from CLI:
removed references to $wgTitle, $wgUser, and $wgLang.

4
RSS.php
View file

@ -4,7 +4,7 @@
*
* @file
* @ingroup Extensions
* @version 2.22
* @version 2.24
* @author mutante, Daniel Kinzler, Rdb, Mafs, Thomas Gries, Alxndr, Chris Reigrut, K001
* @author Kellan Elliott-McCrea <kellan@protest.net> -- author of MagpieRSS
* @author Jeroen De Dauw
@ -14,7 +14,7 @@
* @link http://www.mediawiki.org/wiki/Extension:RSS Documentation
*/
define( "EXTENSION_RSS_VERSION", "2.23" );
define( "EXTENSION_RSS_VERSION", "2.24" );
if ( !defined( 'MEDIAWIKI' ) ) {
die( "This is not a valid entry point.\n" );

2
RSSData.php
View file

@ -41,7 +41,7 @@ class RSSData {
* mark up their RSS, some more precautions are
* needed.
*/
$bit[$name] = $n->nodeValue;
$bit[$name] = trim( $n->nodeValue );
}
}
$this->items[] = $bit;

44
RSSParser.php
View file

@ -363,30 +363,30 @@ class RSSParser {
// use the overloaded multi byte wrapper functions in GlobalFunctions.php
foreach ( array_keys( $item ) as $info ) {
switch ( $info ) {
// ATOM <id> elements and RSS <link> elements are item link urls
case 'id':
$txt = $this->sanitizeUrl( $item['id'] );
$renderedItem = str_replace( '{{{link}}}', $txt, $renderedItem );
break;
case 'link':
if ( !isset( $item['id'] ) ) {
if ( $item[$info] != "" ) {
switch ( $info ) {
// ATOM <id> elements and RSS <link> elements are item link urls
case 'id':
$txt = $this->sanitizeUrl( $item['id'] );
$renderedItem = str_replace( '{{{link}}}', $txt, $renderedItem );
break;
case 'link':
$txt = $this->sanitizeUrl( $item['link'] );
$renderedItem = str_replace( '{{{link}}}', $txt, $renderedItem );
break;
case 'date':
$tempTimezone = date_default_timezone_get();
date_default_timezone_set( 'UTC' );
$txt = date( $this->date, strtotime( $this->escapeTemplateParameter( $item['date'] ) ) );
date_default_timezone_set( $tempTimezone );
$renderedItem = str_replace( '{{{date}}}', $txt, $renderedItem );
break;
default:
$str = $this->escapeTemplateParameter( $item[$info] );
$str = $parser->getFunctionLang()->truncate( $str, $this->ItemMaxLength );
$str = $this->highlightTerms( $str );
$renderedItem = str_replace( '{{{' . $info . '}}}', $parser->insertStripItem( $str ), $renderedItem );
}
$renderedItem = str_replace( '{{{link}}}', $txt, $renderedItem );
break;
case 'date':
$tempTimezone = date_default_timezone_get();
date_default_timezone_set( 'UTC' );
$txt = date( $this->date, strtotime( $this->escapeTemplateParameter( $item['date'] ) ) );
date_default_timezone_set( $tempTimezone );
$renderedItem = str_replace( '{{{date}}}', $txt, $renderedItem );
break;
default:
$str = $this->escapeTemplateParameter( $item[$info] );
$str = $parser->getFunctionLang()->truncate( $str, $this->ItemMaxLength );
$str = $this->highlightTerms( $str );
$renderedItem = str_replace( '{{{' . $info . '}}}', $parser->insertStripItem( $str ), $renderedItem );
}
}