From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Mon, 2 Jan 2012 12:04:51 +0000 (+0000)
Subject: * Moved wfReportTime() call just before executing 'SkinTemplateOutputPageBeforeExec... 
X-Git-Tag: 1.31.0-rc.0~25619
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=90796eaef7b62338a9263e708df8e796568bd412;p=lhc%2Fweb%2Fwiklou.git

* Moved wfReportTime() call just before executing 'SkinTemplateOutputPageBeforeExec' hook to take into account remaining calls
* Group similar stuff
* Factorise calls to $this->getLanguage()
* Facrorise calls to $user->is(Anon|LoggedIn)()
* Changed the code that wraps 'subtitle' and 'undelete' items to be more readable
---

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 7da8bc3489..d23ced487f 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -165,6 +165,7 @@ class SkinTemplate extends Skin {
 
 		wfProfileIn( __METHOD__ . '-stuff' );
 		$this->thispage = $title->getPrefixedDBkey();
+		$this->titletxt = $title->getPrefixedText();
 		$this->userpage = $user->getUserPage()->getPrefixedText();
 		$query = array();
 		if ( !$request->wasPosted() ) {
@@ -178,7 +179,7 @@ class SkinTemplate extends Skin {
 		$this->username = $user->getName();
 		$this->userdisplayname = $user->getDisplayName();
 
-		if ( $user->isLoggedIn() || $this->showIPinHeader() ) {
+		if ( $this->loggedin || $this->showIPinHeader() ) {
 			$this->userpageUrlDetails = self::makeUrlDetails( $this->userpage );
 		} else {
 			# This won't be used in the standard skins, but we define it to preserve the interface
@@ -186,7 +187,6 @@ class SkinTemplate extends Skin {
 			$this->userpageUrlDetails = self::makeKnownUrlDetails( $this->userpage );
 		}
 
-		$this->titletxt = $title->getPrefixedText();
 		wfProfileOut( __METHOD__ . '-stuff' );
 
 		wfProfileIn( __METHOD__ . '-stuff-head' );
@@ -218,25 +218,25 @@ class SkinTemplate extends Skin {
 		$tpl->set( 'pagetitle', $out->getHTMLTitle() );
 		$tpl->set( 'displaytitle', $out->mPageLinkTitle );
 
-		$tpl->set( 'titleprefixeddbkey', $title->getPrefixedDBKey() );
+		$tpl->setRef( 'thispage', $this->thispage );
+		$tpl->setRef( 'titleprefixeddbkey', $this->thispage );
 		$tpl->set( 'titletext', $title->getText() );
 		$tpl->set( 'articleid', $title->getArticleId() );
 
 		$tpl->set( 'isarticle', $out->isArticle() );
 
-		$tpl->setRef( 'thispage', $this->thispage );
 		$subpagestr = $this->subPageSubtitle();
-		$tpl->set(
-			'subtitle', !empty( $subpagestr ) ?
-			'<span class="subpages">' . $subpagestr . '</span>' . $out->getSubtitle() :
-			$out->getSubtitle()
-		);
+		if ( $subpagestr !== '' ) {
+			$subpagestr = '<span class="subpages">' . $subpagestr . '</span>';
+		}
+		$tpl->set( 'subtitle',  $subpagestr . $out->getSubtitle() );
+
 		$undelete = $this->getUndeleteLink();
-		$tpl->set(
-			'undelete', !empty( $undelete ) ?
-			'<span class="subpages">' . $undelete . '</span>' :
-			''
-		);
+		if ( $undelete === '' ) {
+			$tpl->set( 'undelete', '' );
+		} else {
+			$tpl->set( 'undelete', '<span class="subpages">' . $undelete . '</span>' );
+		}
 
 		$tpl->set( 'catlinks', $this->getCategories() );
 		if( $out->isSyndicated() ) {
@@ -258,6 +258,7 @@ class SkinTemplate extends Skin {
 		$tpl->setRef( 'wgScript', $wgScript );
 		$tpl->setRef( 'skinname', $this->skinname );
 		$tpl->set( 'skinclass', get_class( $this ) );
+		$tpl->setRef( 'skin', $this );
 		$tpl->setRef( 'stylename', $this->stylename );
 		$tpl->set( 'printable', $out->isPrintable() );
 		$tpl->set( 'handheld', $request->getBool( 'handheld' ) );
@@ -280,19 +281,18 @@ class SkinTemplate extends Skin {
 		$tpl->setRef( 'logopath', $wgLogo );
 		$tpl->setRef( 'sitename', $wgSitename );
 
-		$contentlang = $wgContLang->getHtmlCode();
-		$contentdir  = $wgContLang->getDir();
-		$userlang = $this->getLanguage()->getHtmlCode();
-		$userdir  = $this->getLanguage()->getDir();
+		$lang = $this->getLanguage();
+		$userlang = $lang->getHtmlCode();
+		$userdir  = $lang->getDir();
 
 		$tpl->set( 'lang', $userlang );
 		$tpl->set( 'dir', $userdir );
-		$tpl->set( 'rtl', $this->getLanguage()->isRTL() );
+		$tpl->set( 'rtl', $lang->isRTL() );
 
-		$tpl->set( 'capitalizeallnouns', $this->getLanguage()->capitalizeAllNouns() ? ' capitalize-all-nouns' : '' );
+		$tpl->set( 'capitalizeallnouns', $lang->capitalizeAllNouns() ? ' capitalize-all-nouns' : '' );
 		$tpl->set( 'showjumplinks', $user->getOption( 'showjumplinks' ) );
-		$tpl->set( 'username', $user->isAnon() ? null : $this->username );
-		$tpl->set( 'userdisplayname', $user->isAnon() ? null : $this->userdisplayname );
+		$tpl->set( 'username', $this->loggedin ? $this->username : null );
+		$tpl->set( 'userdisplayname', $this->loggedin ? $this->userdisplayname : null );
 		$tpl->setRef( 'userpage', $this->userpage );
 		$tpl->setRef( 'userpageurl', $this->userpageUrlDetails['href'] );
 		$tpl->set( 'userlang', $userlang );
@@ -303,7 +303,7 @@ class SkinTemplate extends Skin {
 		$tpl->set( 'userlangattributes', '' );
 		$tpl->set( 'specialpageattributes', '' ); # obsolete
 
-		if ( $userlang !== $contentlang || $userdir !== $contentdir ) {
+		if ( $userlang !== $wgContLang->getHtmlCode() || $userdir !== $wgContLang->getDir() ) {
 			$attrs = " lang='$userlang' dir='$userdir'";
 			$tpl->set( 'userlangattributes', $attrs );
 		}
@@ -312,7 +312,6 @@ class SkinTemplate extends Skin {
 
 		wfProfileIn( __METHOD__ . '-stuff3' );
 		$tpl->set( 'newtalk', $this->getNewtalks() );
-		$tpl->setRef( 'skin', $this );
 		$tpl->set( 'logo', $this->logoText() );
 
 		$tpl->set( 'copyright', false );
@@ -400,7 +399,6 @@ class SkinTemplate extends Skin {
 			$tpl->set( 'debug', '' );
 		}
 
-		$tpl->set( 'reporttime', wfReportTime() );
 		$tpl->set( 'sitenotice', $this->getSiteNotice() );
 		$tpl->set( 'bottomscripts', $this->bottomScripts() );
 		$tpl->set( 'printfooter', $this->printSource() );
@@ -467,6 +465,7 @@ class SkinTemplate extends Skin {
 		}
 
 		$tpl->set( 'debughtml', $this->generateDebugHTML() );
+		$tpl->set( 'reporttime', wfReportTime() );
 
 		// original version by hansm
 		if( !wfRunHooks( 'SkinTemplateOutputPageBeforeExec', array( &$this, &$tpl ) ) ) {