From ddb4e0263407576cc6c5c576fe0d611df29b9ec2 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 17 Nov 2013 21:49:59 +0100 Subject: [PATCH] Break long lines in includes/cache/ Change-Id: I23a6f46f89b3cdcaf2a3b982dc63e779eed5840d --- includes/cache/FileCacheBase.php | 3 ++- includes/cache/MessageCache.php | 13 ++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/includes/cache/FileCacheBase.php b/includes/cache/FileCacheBase.php index d5195c5a95..d33f3f696f 100644 --- a/includes/cache/FileCacheBase.php +++ b/includes/cache/FileCacheBase.php @@ -123,7 +123,8 @@ abstract class FileCacheBase { $cachetime = $this->cacheTimestamp(); $good = ( $timestamp <= $cachetime && $wgCacheEpoch <= $cachetime ); - wfDebug( __METHOD__ . ": cachetime $cachetime, touched '{$timestamp}' epoch {$wgCacheEpoch}, good $good\n" ); + wfDebug( __METHOD__ . + ": cachetime $cachetime, touched '{$timestamp}' epoch {$wgCacheEpoch}, good $good\n" ); return $good; } diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php index eff3ea7b6b..8b52728e03 100644 --- a/includes/cache/MessageCache.php +++ b/includes/cache/MessageCache.php @@ -700,7 +700,8 @@ class MessageCache { * "msg/lang". * * @throws MWException when given an invalid key - * @return string|bool False if the message doesn't exist, otherwise the message (which can be empty) + * @return string|bool False if the message doesn't exist, otherwise the + * message (which can be empty) */ function get( $key, $useDB = true, $langcode = true, $isFullKey = false ) { global $wgContLang; @@ -737,7 +738,12 @@ class MessageCache { // Loop through each language in the fallback list until we find something useful $lang = wfGetLangObj( $langcode ); - $message = $this->getMessageFromFallbackChain( $lang, $lckey, $uckey, !$this->mDisable && $useDB ); + $message = $this->getMessageFromFallbackChain( + $lang, + $lckey, + $uckey, + !$this->mDisable && $useDB + ); // If we still have no message, maybe the key was in fact a full key so try that if ( $message === false ) { @@ -815,7 +821,8 @@ class MessageCache { return $message; } - list( $fallbackChain, $siteFallbackChain ) = Language::getFallbacksIncludingSiteLanguage( $langcode ); + list( $fallbackChain, $siteFallbackChain ) = + Language::getFallbacksIncludingSiteLanguage( $langcode ); // Next try checking the database for all of the fallback languages of the requested language. if ( $useDB ) { -- 2.20.1