jenkins-bot has submitted this change and it was merged.
Change subject: Break long lines in includes/cache/
......................................................................
Break long lines in includes/cache/
Change-Id: I23a6f46f89b3cdcaf2a3b982dc63e779eed5840d
---
M includes/cache/FileCacheBase.php
M includes/cache/MessageCache.php
2 files changed, 12 insertions(+), 4 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/cache/FileCacheBase.php b/includes/cache/FileCacheBase.php
index d5195c5..d33f3f6 100644
--- a/includes/cache/FileCacheBase.php
+++ b/includes/cache/FileCacheBase.php
@@ -123,7 +123,8 @@
$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 eff3ea7..8b52728 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -700,7 +700,8 @@
* "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 @@
// 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 @@
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 ) {
--
To view, visit https://gerrit.wikimedia.org/r/95946
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I23a6f46f89b3cdcaf2a3b982dc63e779eed5840d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: IAlex <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
