From: Daniel Friesen <dantman@users.mediawiki.org>
Date: Mon, 29 Aug 2011 21:48:51 +0000 (+0000)
Subject: Kill off the last $wgUser and improper use of linker by skin in OutputPage.
X-Git-Tag: 1.31.0-rc.0~28022
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=2f77ae9a49efa7acc58113697e30a54dd1a254fc;p=lhc%2Fweb%2Fwiklou.git

Kill off the last $wgUser and improper use of linker by skin in OutputPage.
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index e4336a1d3a..9b10628fa2 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2055,8 +2055,7 @@ class OutputPage extends ContextSource {
 	 * @param $action    String: action that was denied or null if unknown
 	 */
 	public function readOnlyPage( $source = null, $protected = false, $reasons = array(), $action = null ) {
-		global $wgUser, $wgEnableInterwikiTranscluding, $wgEnableInterwikiTemplatesTracking;
-		$skin = $wgUser->getSkin();
+		global $wgEnableInterwikiTranscluding, $wgEnableInterwikiTemplatesTracking;
 
 		$this->setRobotPolicy( 'noindex,nofollow' );
 		$this->setArticleRelated( false );
@@ -2107,11 +2106,12 @@ $templates
 </div>
 " );
 			if ( $wgEnableInterwikiTranscluding && $wgEnableInterwikiTemplatesTracking ) {
+				$distantTemplates = Linker::formatDistantTemplates( $article->getUsedDistantTemplates() );
 				$this->addHTML( "<div class='distantTemplatesUsed'>
-{$skin->formatDistantTemplates( $article->getUsedDistantTemplates( ) )}
+$distantTemplates
 </div>
 " );
-		}
+			}
 		}
 
 		# If the title doesn't exist, it's fairly pointless to print a return