From: Aryeh Gregor Date: Tue, 6 May 2008 14:14:37 +0000 (+0000) Subject: sed -i '/.*\$fname =.*/d;s/( \$fname )/( __METHOD__ )/' includes/SkinTemplate.php... X-Git-Tag: 1.31.0-rc.0~47866 X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=bcec4de9052f242cbcbd5e91b5d9d1093c712922;p=lhc%2Fweb%2Fwiklou.git sed -i '/.*\$fname =.*/d;s/( \$fname )/( __METHOD__ )/' includes/SkinTemplate.php && manually_fix_remaining_uses && php -l includes/SkinTemplate.php --- diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index 581772d3e3..9feece1d0e 100644 --- a/includes/SkinTemplate.php +++ b/includes/SkinTemplate.php @@ -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; } } @@ -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()); @@ -452,13 +450,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 +479,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 +577,7 @@ class SkinTemplate extends Skin { } wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$wgTitle ) ); - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); return $personal_urls; } @@ -643,8 +640,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 +668,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 +694,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 +769,7 @@ class SkinTemplate extends Skin { } } - wfProfileOut( "$fname-live" ); + wfProfileOut( __METHOD__."-live" ); if( $this->loggedin ) { if( !$this->mTitle->userIsWatching()) { @@ -827,7 +823,7 @@ class SkinTemplate extends Skin { wfRunHooks( 'SkinTemplateContentActions', array( &$content_actions ) ); - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); return $content_actions; } @@ -842,8 +838,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 +940,7 @@ class SkinTemplate extends Skin { 'href' => self::makeSpecialUrlSubpage( 'Emailuser', $this->mTitle->getText() ) ); } - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); return $nav_urls; } @@ -962,8 +957,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 +1009,14 @@ class SkinTemplate extends Skin { if ( !empty($sitecss) || !empty($usercss) ) { $this->usercss = "/**/'; } - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); } /** * @private */ function setupUserJs( $allowUserJs ) { - $fname = 'SkinTemplate::setupUserJs'; - wfProfileIn( $fname ); + wfProfileIn( __METHOD__ ); global $wgRequest, $wgJsMimeType; $action = $wgRequest->getText('action'); @@ -1036,7 +1029,7 @@ class SkinTemplate extends Skin { $this->userjs = self::makeUrl($this->userpage.'/'.$this->skinname.'.js', 'action=raw&ctype='.$wgJsMimeType.'&dontcountme=s'); } } - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); } /** @@ -1046,12 +1039,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 +1051,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; } @@ -1092,8 +1083,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 +1096,7 @@ class SkinTemplate extends Skin { $s .= $userJS; } - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); return $s; } }