http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95705

Revision: 95705
Author:   dantman
Date:     2011-08-29 21:48:51 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
Kill off the last $wgUser and improper use of linker by skin in OutputPage.

Modified Paths:
--------------
    trunk/phase3/includes/OutputPage.php

Modified: trunk/phase3/includes/OutputPage.php
===================================================================
--- trunk/phase3/includes/OutputPage.php        2011-08-29 21:41:17 UTC (rev 
95704)
+++ trunk/phase3/includes/OutputPage.php        2011-08-29 21:48:51 UTC (rev 
95705)
@@ -2055,8 +2055,7 @@
         * @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,12 +2106,13 @@
 </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
                # link to it.  After all, you just tried editing it and 
couldn't, so


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to