http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88589
Revision: 88589
Author: demon
Date: 2011-05-22 18:00:48 +0000 (Sun, 22 May 2011)
Log Message:
-----------
Followup r88588 ($wgArticle fixes)
* Remove $wgArticle from a bunch of comments in extensions
* Minor cleanup to LQT to remove some globals (or shift them up into the
SpecialPage and out of the LqtView). Mainly so I could kill $wgArticle
** Same thing in Multilingual.
* Known offenders still: MetavidWiki, AbuseFilter (bug 29092)
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/presentation/FlaggedPageView.php
trunk/extensions/FlaggedRevs/presentation/FlaggedRevsUI.hooks.php
trunk/extensions/LiquidThreads/classes/View.php
trunk/extensions/LiquidThreads/pages/SpecialHotTopics.php
trunk/extensions/MultilingualLiquidThreads/LiquidThreads/classes/View.php
trunk/extensions/MultilingualLiquidThreads/LiquidThreads/pages/SpecialHotTopics.php
trunk/extensions/WikiArticleFeeds/WikiArticleFeeds.php
Modified: trunk/extensions/FlaggedRevs/presentation/FlaggedPageView.php
===================================================================
--- trunk/extensions/FlaggedRevs/presentation/FlaggedPageView.php
2011-05-22 17:59:47 UTC (rev 88588)
+++ trunk/extensions/FlaggedRevs/presentation/FlaggedPageView.php
2011-05-22 18:00:48 UTC (rev 88589)
@@ -55,7 +55,7 @@
}
/**
- * Get the FlaggedPage instance associated with $wgArticle/$wgTitle,
+ * Get the FlaggedPage instance associated with $wgTitle,
* or false if there isn't such a title
*/
public static function globalArticleInstance() {
Modified: trunk/extensions/FlaggedRevs/presentation/FlaggedRevsUI.hooks.php
===================================================================
--- trunk/extensions/FlaggedRevs/presentation/FlaggedRevsUI.hooks.php
2011-05-22 17:59:47 UTC (rev 88588)
+++ trunk/extensions/FlaggedRevs/presentation/FlaggedRevsUI.hooks.php
2011-05-22 18:00:48 UTC (rev 88589)
@@ -219,7 +219,6 @@
// *sigh*...skip, dealt with in setNavigation()
return true;
}
- // Note: $wgArticle sometimes not set here
if ( FlaggedPageView::globalArticleInstance() != null ) {
$view = FlaggedPageView::singleton();
$view->setActionTabs( $skin, $contentActions );
@@ -230,7 +229,6 @@
// Vector et al: $links is all the tabs (2 levels)
public static function onSkinTemplateNavigation( Skin $skin, array
&$links ) {
- // Note: $wgArticle sometimes not set here
if ( FlaggedPageView::globalArticleInstance() != null ) {
$view = FlaggedPageView::singleton();
$view->setActionTabs( $skin, $links['actions'] );
@@ -579,7 +577,6 @@
}
public static function injectPostEditURLParams( $article,
&$sectionAnchor, &$extraQuery ) {
- // Note: $wgArticle sometimes not set here
if ( FlaggedPageView::globalArticleInstance() != null ) {
$view = FlaggedPageView::singleton();
$view->injectPostEditURLParams( $sectionAnchor,
$extraQuery );
Modified: trunk/extensions/LiquidThreads/classes/View.php
===================================================================
--- trunk/extensions/LiquidThreads/classes/View.php 2011-05-22 17:59:47 UTC
(rev 88588)
+++ trunk/extensions/LiquidThreads/classes/View.php 2011-05-22 18:00:48 UTC
(rev 88589)
@@ -37,11 +37,6 @@
$this->user_color_index = 1;
}
- static function getView() {
- global $wgOut, $wgArticle, $wgTitle, $wgUser, $wgRequest;
- return new LqtView( $wgOut, $wgArticle, $wgTitle, $wgUser,
$wgRequest );
- }
-
function setHeaderLevel( $int ) {
$this->headerLevel = $int;
}
Modified: trunk/extensions/LiquidThreads/pages/SpecialHotTopics.php
===================================================================
--- trunk/extensions/LiquidThreads/pages/SpecialHotTopics.php 2011-05-22
17:59:47 UTC (rev 88588)
+++ trunk/extensions/LiquidThreads/pages/SpecialHotTopics.php 2011-05-22
18:00:48 UTC (rev 88589)
@@ -5,12 +5,13 @@
}
function execute( $par ) {
- global $wgOut;
+ global $wgOut, $wgUser, $wgRequest;
$this->setHeaders();
$wgOut->setPageTitle( wfMsg( 'lqt-hot-topics' ) );
- $view = LqtView::getView();
+ $title = $this->getTitle();
+ $view = new LqtView( $wgOut, new Article( $title ), $title,
$wgUser, $wgRequest );
// Get hot topics
$topics = LqtHotTopicsController::getHotThreads();
Modified:
trunk/extensions/MultilingualLiquidThreads/LiquidThreads/classes/View.php
===================================================================
--- trunk/extensions/MultilingualLiquidThreads/LiquidThreads/classes/View.php
2011-05-22 17:59:47 UTC (rev 88588)
+++ trunk/extensions/MultilingualLiquidThreads/LiquidThreads/classes/View.php
2011-05-22 18:00:48 UTC (rev 88589)
@@ -37,11 +37,6 @@
$this->user_color_index = 1;
}
- static function getView() {
- global $wgOut, $wgArticle, $wgTitle, $wgUser, $wgRequest;
- return new LqtView( $wgOut, $wgArticle, $wgTitle, $wgUser,
$wgRequest );
- }
-
function setHeaderLevel( $int ) {
$this->headerLevel = $int;
}
Modified:
trunk/extensions/MultilingualLiquidThreads/LiquidThreads/pages/SpecialHotTopics.php
===================================================================
---
trunk/extensions/MultilingualLiquidThreads/LiquidThreads/pages/SpecialHotTopics.php
2011-05-22 17:59:47 UTC (rev 88588)
+++
trunk/extensions/MultilingualLiquidThreads/LiquidThreads/pages/SpecialHotTopics.php
2011-05-22 18:00:48 UTC (rev 88589)
@@ -5,12 +5,13 @@
}
function execute( $par ) {
- global $wgOut;
+ global $wgOut, $wgUser, $wgRequest;
$this->setHeaders();
$wgOut->setPageTitle( wfMsg( 'lqt-hot-topics' ) );
- $view = LqtView::getView();
+ $title = $this->getTitle();
+ $view = new LqtView( $wgOut, new Article( $title ), $title,
$wgUser, $wgRequest );
LqtView::addJsAndCss();
Modified: trunk/extensions/WikiArticleFeeds/WikiArticleFeeds.php
===================================================================
--- trunk/extensions/WikiArticleFeeds/WikiArticleFeeds.php 2011-05-22
17:59:47 UTC (rev 88588)
+++ trunk/extensions/WikiArticleFeeds/WikiArticleFeeds.php 2011-05-22
18:00:48 UTC (rev 88589)
@@ -310,7 +310,7 @@
* Injects handling of the 'feed' action.
* Usage: $wgHooks['UnknownAction'][] = 'wfWikiArticleFeedsAction';
* @param $action Handle to an action string (presumably same as global
$action).
- * @param $article Article to be converted to rss or atom feed (presumably
same as $wgArticle).
+ * @param $article Article to be converted to rss or atom feed
*/
function wfWikiArticleFeedsAction( $action, $article ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
