jenkins-bot has submitted this change and it was merged.
Change subject: Fix phantom test failures
......................................................................
Fix phantom test failures
Changed CDBMessageIndex so that it actually creates an empty cache
to avoid recursion. Also decrement recusion count before returning,
to prevent all subsequent calls triggering a warning message once
it has been triggered once.
Change-Id: Ia0e0f5bd7ef53aeb8312a4e448f8c6f68fbcb15c
---
M utils/MessageIndex.php
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/utils/MessageIndex.php b/utils/MessageIndex.php
index 741e20b..9ef5ed6 100644
--- a/utils/MessageIndex.php
+++ b/utils/MessageIndex.php
@@ -92,6 +92,7 @@
$msg = __METHOD__ . ': trying to recurse - building the
index first time?';
wfWarn( $msg );
+ $recusion--;
return array();
}
$recursion++;
@@ -508,10 +509,8 @@
$file = TranslateUtils::cacheFile( $this->filename );
if ( !file_exists( $file ) ) {
- /* The rebuild() will call retrieve(), which we prevent
from
- * recursing by setting the index to empty array now.
- */
- $this->index = array();
+ // Create an empty index to allow rebuild
+ $this->store( array() );
$this->index = $this->rebuild();
}
--
To view, visit https://gerrit.wikimedia.org/r/149909
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0e0f5bd7ef53aeb8312a4e448f8c6f68fbcb15c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
