jenkins-bot has submitted this change and it was merged.
Change subject: The job queue does not run against multiple wikis at once
......................................................................
The job queue does not run against multiple wikis at once
...because that would be crazy.
Also fix return documentation.
Change-Id: I38c06767f4e53bafff19b4f0819158939ef264c0
---
M includes/cache/RevisionLocalCache.php
M includes/cache/TitleLocalCache.php
2 files changed, 1 insertion(+), 25 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/cache/RevisionLocalCache.php
b/includes/cache/RevisionLocalCache.php
index 6ef5003..3e1f81c 100644
--- a/includes/cache/RevisionLocalCache.php
+++ b/includes/cache/RevisionLocalCache.php
@@ -11,22 +11,10 @@
private static $instance;
/**
- * The current wiki id
- * @var string|null
- */
- private static $wiki;
-
- /**
* Create a EchoRevisionLocalCache object
* @return EchoRevisionLocalCache
*/
public static function create() {
- // A job queue may run against multiple wikis,
- // initialize a new one for the current wiki
- if ( wfWikiId() != self::$wiki ) {
- self::$instance = null;
- self::$wiki = wfWikiId();
- }
if ( !self::$instance ) {
self::$instance = new EchoRevisionLocalCache();
}
diff --git a/includes/cache/TitleLocalCache.php
b/includes/cache/TitleLocalCache.php
index 1ca5c5d..42e2be9 100644
--- a/includes/cache/TitleLocalCache.php
+++ b/includes/cache/TitleLocalCache.php
@@ -11,22 +11,10 @@
private static $instance;
/**
- * The current wiki id
- * @var string|null
- */
- private static $wiki;
-
- /**
* Create a TitleLocalCache object
- * @return TitleLocalCache
+ * @return EchoTitleLocalCache
*/
public static function create() {
- // A job queue may run against multiple wikis,
- // initialize a new one for the current wiki
- if ( wfWikiId() != self::$wiki ) {
- self::$instance = null;
- self::$wiki = wfWikiId();
- }
if ( !self::$instance ) {
self::$instance = new EchoTitleLocalCache();
}
--
To view, visit https://gerrit.wikimedia.org/r/215275
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I38c06767f4e53bafff19b4f0819158939ef264c0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Mattflaschen <mflasc...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
