Daniel Kinzler has uploaded a new change for review. https://gerrit.wikimedia.org/r/76893
Change subject: Fix compatibility with MW 1.21 ...................................................................... Fix compatibility with MW 1.21 Change-Id: Ie84ebcb1f16d3fd4157222027cfb799e692b774d --- M News.php M NewsRenderer.php 2 files changed, 16 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/News refs/changes/93/76893/1 diff --git a/News.php b/News.php index 806627f..46096b0 100644 --- a/News.php +++ b/News.php @@ -48,14 +48,16 @@ function wfNewsTag( $templatetext, $argv, $parser ) { global $wgTitle; + $context = RequestContext::getMain(); + $parser->disableCache(); //TODO: use smart cache & purge...? - $renderer = new NewsRenderer($wgTitle, $templatetext, $argv, $parser); + $renderer = new NewsRenderer($context, $templatetext, $argv, $parser); return $renderer->renderNews(); } function wfNewsFeedTag( $templatetext, $argv, $parser ) { - global $wgTitle, $wgOut; + global $wgOut; $parser->disableCache(); //TODO: use smart cache & purge...? $wgOut->setSyndicated( true ); @@ -66,7 +68,9 @@ if ( $silent ) return ""; - $renderer = new NewsRenderer($wgTitle, $templatetext, $argv, $parser); + $context = RequestContext::getMain(); + + $renderer = new NewsRenderer($context, $templatetext, $argv, $parser); $html = $renderer->renderFeedPreview(); return $html; } diff --git a/NewsRenderer.php b/NewsRenderer.php index 531b16f..005aa36 100644 --- a/NewsRenderer.php +++ b/NewsRenderer.php @@ -50,7 +50,6 @@ var $permalinks; //wether to force permalinks in feeds, even in publication mode static function newFromArticle( $article, $parser ) { - $title = $article->getTitle(); $article->getContent(); $text = $article->mContent; if (!$text) return null; @@ -58,7 +57,7 @@ $uniq_prefix = "\x07NR-UNIQ"; $elements = array( 'nowiki', 'gallery', 'newsfeed'); $matches = array(); - $text = Parser::extractTagsAndParams( $elements, $text, $matches, $uniq_prefix ); + Parser::extractTagsAndParams( $elements, $text, $matches, $uniq_prefix ); foreach( $matches as $marker => $data ) { list( $element, $content, $params, $tag ) = $data; @@ -67,18 +66,18 @@ if ($tagName != 'newsfeed') continue; #if (!is_null($id) && (!isset($params['id']) || $params['id'] != $id)) continue; - return new NewsRenderer( $title, $content, $params, $parser ); + return new NewsRenderer( $article->getContext(), $content, $params, $parser ); } return null; } - function __construct( $title, $templatetext, $argv, $parser ) { - global $wgContLang, $wgUser; + function __construct( IContextSource $context, $templatetext, $argv, $parser ) { + global $wgContLang; - $this->title = $title; + $this->title = $context->getTitle(); - $this->skin = $wgUser->getSkin(); + $this->skin = $context->getSkin(); $this->parser = $parser; $this->templatetext = $templatetext; @@ -105,7 +104,7 @@ $this->templateoptions->setEditSection( false ); $this->templateoptions->setNumberHeadings( false ); $this->templateoptions->setRemoveComments( true ); - $this->templateoptions->setUseDynamicDates( false ); + //$this->templateoptions->setUseDynamicDates( false ); // removed in mw 1.21 $this->templateoptions->setInterwikiMagic( true ); //strip interlanguage-links $this->templateoptions->setAllowSpecialInclusion( false ); @@ -385,8 +384,7 @@ } function renderFeedItem( $item ) { - global $wgContLang, $wgUser; - $sk = $wgUser->getSkin(); + global $wgContLang; $html = ''; $html .= '<div class="newsfeed-item hentry">'; @@ -440,6 +438,7 @@ if ( $this->publication || $row->rc_new ) { $name = $title->getPrefixedText(); + $permaq = ''; } else { $name = $title->getPrefixedText() . ( $row->rc_comment ? (' - ' . $row->rc_comment) : '' ); -- To view, visit https://gerrit.wikimedia.org/r/76893 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie84ebcb1f16d3fd4157222027cfb799e692b774d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/News Gerrit-Branch: master Gerrit-Owner: Daniel Kinzler <daniel.kinz...@wikimedia.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits