Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Cache page content language in Title object"

Browse source
This commit is contained in:
jenkins-bot 2013-11-07 01:43:00 +00:00 committed by Gerrit Code Review
commit a36b3c44ed
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
includes/Title.php
View file

@ -86,6 +86,7 @@ class Title {
var $mRedirect = null; // /< Is the article at this title a redirect?
var $mNotificationTimestamp = array(); // /< Associative array of user ID -> timestamp/false
var $mHasSubpage; // /< Whether a page has any subpages
private $mPageLanguage = false; // /< The (string) language code of the page's language and content code.
// @}
/**
@ -3110,6 +3111,7 @@ class Title {
$this->mLatestID = false;
$this->mContentModel = false;
$this->mEstimateRevisions = null;
$this->mPageLanguage = false;
}
/**
@ -4812,18 +4814,26 @@ class Title {
* @return Language
*/
public function getPageLanguage() {
global $wgLang;
global $wgLang, $wgLanguageCode;
wfProfileIn( __METHOD__ );
if ( $this->isSpecialPage() ) {
// special pages are in the user language
wfProfileOut( __METHOD__ );
return $wgLang;
}
//TODO: use the LinkCache to cache this! Note that this may depend on user settings, so the cache should be only per-request.
//NOTE: ContentHandler::getPageLanguage() may need to load the content to determine the page language!
$contentHandler = ContentHandler::getForTitle( $this );
$pageLang = $contentHandler->getPageLanguage( $this );
return wfGetLangObj( $pageLang );
if ( !$this->mPageLanguage || $this->mPageLanguage[1] !== $wgLanguageCode ) {
// Note that this may depend on user settings, so the cache should be only per-request.
// NOTE: ContentHandler::getPageLanguage() may need to load the content to determine the page language!
// Checking $wgLanguageCode hasn't changed for the benefit of unit tests.
$contentHandler = ContentHandler::getForTitle( $this );
$langObj = wfGetLangObj( $contentHandler->getPageLanguage( $this ) );
$this->mPageLanguage = array( $langObj->getCode(), $wgLanguageCode );
} else {
$langObj = wfGetLangObj( $this->mPageLanguage[0] );
}
wfProfileOut( __METHOD__ );
return $langObj;
}
/**