Cleanup for displaying old versions
[lhc/web/wiklou.git] / includes / SkinTemplate.php
index 581772d..562defd 100644 (file)
@@ -22,7 +22,7 @@ if ( ! defined( 'MEDIAWIKI' ) )
  * to be passed to the template engine.
  *
  * @private
- * @addtogroup Skins
+ * @ingroup Skins
  */
 class MediaWiki_I18N {
        var $_context = array();
@@ -32,8 +32,7 @@ class MediaWiki_I18N {
        }
 
        function translate($value) {
-               $fname = 'SkinTemplate-translate';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                // Hack for i18n:attributes in PHPTAL 1.0.0 dev version as of 2004-10-23
                $value = preg_replace( '/^string:/', '', $value );
@@ -48,7 +47,7 @@ class MediaWiki_I18N {
                        wfRestoreWarnings();
                        $value = str_replace($src, $varValue, $value);
                }
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $value;
        }
 }
@@ -63,7 +62,7 @@ class MediaWiki_I18N {
  * to the computations individual esi snippets need. Most importantly no body
  * parsing for most of those of course.
  *
- * @addtogroup Skins
+ * @ingroup Skins
  */
 class SkinTemplate extends Skin {
        /**#@+
@@ -136,13 +135,12 @@ class SkinTemplate extends Skin {
                global $wgUseTrackbacks;
                global $wgArticlePath, $wgScriptPath, $wgServer, $wgLang, $wgCanonicalNamespaceNames;
 
-               $fname = 'SkinTemplate::outputPage';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                $oldid = $wgRequest->getVal( 'oldid' );
                $diff = $wgRequest->getVal( 'diff' );
 
-               wfProfileIn( "$fname-init" );
+               wfProfileIn( __METHOD__."-init" );
                $this->initPage( $out );
 
                $this->mTitle =& $wgTitle;
@@ -153,9 +151,9 @@ class SkinTemplate extends Skin {
                #if ( $wgUseDatabaseMessages ) { // uncomment this to fall back to GetText
                $tpl->setTranslator(new MediaWiki_I18N());
                #}
-               wfProfileOut( "$fname-init" );
+               wfProfileOut( __METHOD__."-init" );
 
-               wfProfileIn( "$fname-stuff" );
+               wfProfileIn( __METHOD__."-stuff" );
                $this->thispage = $this->mTitle->getPrefixedDbKey();
                $this->thisurl = $this->mTitle->getPrefixedURL();
                $this->loggedin = $wgUser->isLoggedIn();
@@ -177,9 +175,9 @@ class SkinTemplate extends Skin {
                $this->setupUserCss();
                $this->setupUserJs( $out->isUserJsAllowed() );
                $this->titletxt = $this->mTitle->getPrefixedText();
-               wfProfileOut( "$fname-stuff" );
+               wfProfileOut( __METHOD__."-stuff" );
 
-               wfProfileIn( "$fname-stuff2" );
+               wfProfileIn( __METHOD__."-stuff2" );
                $tpl->set( 'title', $wgOut->getPageTitle() );
                $tpl->set( 'pagetitle', $wgOut->getHTMLTitle() );
                $tpl->set( 'displaytitle', $wgOut->mPageLinkTitle );
@@ -317,9 +315,9 @@ class SkinTemplate extends Skin {
                } else {
                        $ntl = '';
                }
-               wfProfileOut( "$fname-stuff2" );
+               wfProfileOut( __METHOD__."-stuff2" );
 
-               wfProfileIn( "$fname-stuff3" );
+               wfProfileIn( __METHOD__."-stuff3" );
                $tpl->setRef( 'newtalk', $ntl );
                $tpl->setRef( 'skin', $this);
                $tpl->set( 'logo', $this->logoText() );
@@ -384,9 +382,9 @@ class SkinTemplate extends Skin {
                        $tpl->set('credits', false);
                        $tpl->set('numberofwatchingusers', false);
                }
-               wfProfileOut( "$fname-stuff3" );
+               wfProfileOut( __METHOD__."-stuff3" );
 
-               wfProfileIn( "$fname-stuff4" );
+               wfProfileIn( __METHOD__."-stuff4" );
                $tpl->set( 'copyrightico', $this->getCopyrightIcon() );
                $tpl->set( 'poweredbyico', $this->getPoweredBy() );
                $tpl->set( 'disclaimer', $this->disclaimerLink() );
@@ -423,7 +421,7 @@ class SkinTemplate extends Skin {
                } else {
                        $tpl->set('language_urls', false);
                }
-               wfProfileOut( "$fname-stuff4" );
+               wfProfileOut( __METHOD__."-stuff4" );
 
                # Personal toolbar
                $tpl->set('personal_urls', $this->buildPersonalUrls());
@@ -438,11 +436,7 @@ class SkinTemplate extends Skin {
                } else {
                        $tpl->set('body_ondblclick', false);
                }
-               if( $this->iseditable && $wgUser->getOption( 'editsectiononrightclick' ) ) {
-                       $tpl->set( 'body_onload', 'setupRightClickEdit()' );
-               } else {
-                       $tpl->set( 'body_onload', false );
-               }
+               $tpl->set( 'body_onload', false );
                $tpl->set( 'sidebar', $this->buildSidebar() );
                $tpl->set( 'nav_urls', $this->buildNavUrls() );
 
@@ -452,13 +446,13 @@ class SkinTemplate extends Skin {
                }
 
                // execute template
-               wfProfileIn( "$fname-execute" );
+               wfProfileIn( __METHOD__."-execute" );
                $res = $tpl->execute();
-               wfProfileOut( "$fname-execute" );
+               wfProfileOut( __METHOD__."-execute" );
 
                // result may be an error
                $this->printOrError( $res );
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
        }
 
        /**
@@ -481,9 +475,8 @@ class SkinTemplate extends Skin {
        function buildPersonalUrls() {
                global $wgTitle, $wgRequest;
 
-               $fname = 'SkinTemplate::buildPersonalUrls';
                $pageurl = $wgTitle->getLocalURL();
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                /* set up the default links for the personal toolbar */
                $personal_urls = array();
@@ -580,7 +573,7 @@ class SkinTemplate extends Skin {
                }
 
                wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$wgTitle ) );
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $personal_urls;
        }
 
@@ -643,8 +636,7 @@ class SkinTemplate extends Skin {
         */
        function buildContentActionUrls () {
                global $wgContLang, $wgLang, $wgOut;
-               $fname = 'SkinTemplate::buildContentActionUrls';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                global $wgUser, $wgRequest;
                $action = $wgRequest->getText( 'action' );
@@ -672,7 +664,7 @@ class SkinTemplate extends Skin {
                                '',
                                true);
 
-                       wfProfileIn( "$fname-edit" );
+                       wfProfileIn( __METHOD__."-edit" );
                        if ( $this->mTitle->quickUserCan( 'edit' ) && ( $this->mTitle->exists() || $this->mTitle->quickUserCan( 'create' ) ) ) {
                                $istalk = $this->mTitle->isTalkPage();
                                $istalkclass = $istalk?' istalk':'';
@@ -698,9 +690,9 @@ class SkinTemplate extends Skin {
                                        'href' => $this->mTitle->getLocalUrl( $this->editUrlOptions() )
                                );
                        }
-                       wfProfileOut( "$fname-edit" );
+                       wfProfileOut( __METHOD__."-edit" );
 
-                       wfProfileIn( "$fname-live" );
+                       wfProfileIn( __METHOD__."-live" );
                        if ( $this->mTitle->getArticleId() ) {
 
                                $content_actions['history'] = array(
@@ -773,7 +765,7 @@ class SkinTemplate extends Skin {
                                }
                        }
 
-                       wfProfileOut( "$fname-live" );
+                       wfProfileOut( __METHOD__."-live" );
 
                        if( $this->loggedin ) {
                                if( !$this->mTitle->userIsWatching()) {
@@ -827,7 +819,7 @@ class SkinTemplate extends Skin {
 
                wfRunHooks( 'SkinTemplateContentActions', array( &$content_actions ) );
 
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $content_actions;
        }
 
@@ -842,8 +834,7 @@ class SkinTemplate extends Skin {
                global $wgUseTrackbacks, $wgTitle, $wgUser, $wgRequest;
                global $wgEnableUploads, $wgUploadNavigationUrl;
 
-               $fname = 'SkinTemplate::buildNavUrls';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                $action = $wgRequest->getText( 'action' );
 
@@ -945,7 +936,7 @@ class SkinTemplate extends Skin {
                                'href' => self::makeSpecialUrlSubpage( 'Emailuser', $this->mTitle->getText() )
                        );
                }
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $nav_urls;
        }
 
@@ -962,8 +953,7 @@ class SkinTemplate extends Skin {
         * @private
         */
        function setupUserCss() {
-               $fname = 'SkinTemplate::setupUserCss';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                global $wgRequest, $wgAllowUserCss, $wgUseSiteCss, $wgContLang, $wgSquidMaxage, $wgStylePath, $wgUser;
 
@@ -1015,15 +1005,14 @@ class SkinTemplate extends Skin {
                if ( !empty($sitecss) || !empty($usercss) ) {
                        $this->usercss = "/*<![CDATA[*/\n" . $sitecss . $usercss . '/*]]>*/';
                }
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
        }
 
        /**
         * @private
         */
        function setupUserJs( $allowUserJs ) {
-               $fname = 'SkinTemplate::setupUserJs';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                global $wgRequest, $wgJsMimeType;
                $action = $wgRequest->getText('action');
@@ -1033,10 +1022,10 @@ class SkinTemplate extends Skin {
                                # XXX: additional security check/prompt?
                                $this->userjsprev = '/*<![CDATA[*/ ' . $wgRequest->getText('wpTextbox1') . ' /*]]>*/';
                        } else {
-                               $this->userjs = self::makeUrl($this->userpage.'/'.$this->skinname.'.js', 'action=raw&ctype='.$wgJsMimeType.'&dontcountme=s');
+                               $this->userjs = self::makeUrl($this->userpage.'/'.$this->skinname.'.js', 'action=raw&ctype='.$wgJsMimeType);
                        }
                }
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
        }
 
        /**
@@ -1046,12 +1035,11 @@ class SkinTemplate extends Skin {
         * @private
         */
        function setupPageCss() {
-               $fname = 'SkinTemplate::setupPageCss';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
                $out = false;
                wfRunHooks( 'SkinTemplateSetupPageCss', array( &$out ) );
 
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $out;
        }
 
@@ -1059,12 +1047,11 @@ class SkinTemplate extends Skin {
         * returns css with user-specific options
         */
        public function getUserStylesheet() {
-               $fname = 'SkinTemplate::getUserStylesheet';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                $s = "/* generated user stylesheet */\n";
                $s .= $this->reallyDoGetUserStyles();
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $s;
        }
 
@@ -1074,7 +1061,7 @@ class SkinTemplate extends Skin {
         *
         * @return string
         */
-       private function getPrintCss() {
+       protected function getPrintCss() {
                global $wgStylePath;
                return $wgStylePath . "/common/commonPrint.css";
        }
@@ -1092,8 +1079,7 @@ class SkinTemplate extends Skin {
         * @return string
         */
        public function getUserJs() {
-               $fname = 'SkinTemplate::getUserJs';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                $s = parent::getUserJs();
                $s .= "\n\n/* MediaWiki:".ucfirst($this->skinname).".js (deprecated; migrate to Common.js!) */\n";
@@ -1106,7 +1092,7 @@ class SkinTemplate extends Skin {
                        $s .= $userJS;
                }
 
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $s;
        }
 }
@@ -1114,7 +1100,7 @@ class SkinTemplate extends Skin {
 /**
  * Generic wrapper for template functions, with interface
  * compatible with what we use of PHPTAL 0.7.
- * @addtogroup Skins
+ * @ingroup Skins
  */
 class QuickTemplate {
        /**