wikimedia/mediawiki-extensions-RSS
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/RSS synced 2024-11-28 01:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Remove the call to disableCache(), that, upon double-checking, does undermine the caching that updateCacheExpiry() is trying to set up in the very next line.

Browse source 
* Fix renderItem so that it isn't overly complex and just subsitutes the parsed contents of RSS elements (e.g. {{{description}}} is substituted with the contents of the <description> tag).
This commit is contained in:
Mark A. Hershberger 2010-11-16 22:06:59 +00:00
parent 35365abac2
commit a5321b114b
2 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RSSHooks.php
View file

@ -29,7 +29,7 @@ class RSSHooks {
} else {
$timeout = $wgRSSCacheAge;
}
$parser->disableCache();
$parser->getOutput()->updateCacheExpiry( $timeout );
$rss = new RSSParser( $input, $args );

35
RSSParser.php
View file

@ -254,33 +254,26 @@ class RSSParser {
* @param $frame the frame param to pass to recursiveTagParse()
*/
protected function renderItem( $item, $parser, $frame ) {
$parts = explode( '|', $this->itemTemplate );
$output = '';
if ( count( $parts ) > 1 && isset( $parser ) && isset( $frame ) ) {
$output = "";
if ( isset( $parser ) && isset( $frame ) ) {
$rendered = array();
foreach ( $this->displayFields as $field ) {
if ( isset($item[$field] ) ) {
$item[$field] = $this->highlightTerms( wfEscapeWikiText( $item[$field] ) );
$item[$field] = $this->highlightTerms( $item[$field] );
}
}
foreach ( $parts as $part ) {
$bits = explode( '=', $part );
$left = null;
if ( count( $bits ) == 2 ) {
$left = trim( $bits[0] );
}
if ( isset( $item[$left] ) ) {
$leftValue = str_replace( '{{{' . $left . '}}}', $item[$left], $bits[1] );
$rendered[] = "$left = $leftValue";
} else {
$rendered[] = $part;
}
$rendered = $this->itemTemplate;
// $info will only be an XML element name, so we're safe
// using it. $item[$info] is handled by the XML parser --
// and that means bad RSS with stuff like
// <description><script>alert("hi")</script></description> will find its
// rogue <script> tags neutered.
foreach ( array_keys( $item ) as $info ) {
$rendered = str_replace( '{{{' . $info . '}}}', wfEscapeWikiText( $item[$info] ),
$rendered );
}
$output .= $parser->recursiveTagParse( implode( ' | ', $rendered ), $frame );
$output .= $parser->recursiveTagParse( $rendered, $frame );
}
return $output;
}
@ -421,7 +414,7 @@ class RSSHighlighter {
$styleStart = "<span style='font-weight: bold; background: none repeat scroll 0%% 0%% rgb(%s); color: %s;'>";
$styleEnd = '</span>';
# bg colors cribbed from Google's highlighting of search teerms
# bg colors cribbed from Google's highlighting of search terms
$bgcolor = array( '255, 255, 102', '160, 255, 255', '153, 255, 153',
'255, 153, 153', '255, 102, 255', '136, 0, 0', '0, 170, 0', '136, 104, 0',
'0, 70, 153', '153, 0, 153' );