jenkins-bot has submitted this change and it was merged.
Change subject: Revert change dispatcher patches
......................................................................
Revert change dispatcher patches
these appear to be causing problems. it is better
to revert to the state we had before deploy
and then can investigate tomorrow or the days after.
see P430 and T93831 for details
Change-Id: I81ab3d4f64591c20cad09838198eb75b6030eabd
---
M composer.lock
M extensions/Wikibase/lib/maintenance/dispatchChanges.php
M vendor/composer/installed.json
3 files changed, 11 insertions(+), 11 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 1d8c9bb..2ab3e90 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1237,12 +1237,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "75b3a2284f1780663c54655957db2992d774d7dd"
+ "reference": "7d3a0b11d0321ff09fde1b5692599860fea6496c"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/75b3a2284f1780663c54655957db2992d774d7dd";,
- "reference": "75b3a2284f1780663c54655957db2992d774d7dd",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/7d3a0b11d0321ff09fde1b5692599860fea6496c";,
+ "reference": "7d3a0b11d0321ff09fde1b5692599860fea6496c",
"shasum": ""
},
"require": {
@@ -1309,7 +1309,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2015-03-24 14:53:33"
+ "time": "2015-03-25 00:03:14"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/lib/maintenance/dispatchChanges.php
b/extensions/Wikibase/lib/maintenance/dispatchChanges.php
index 8b99b38..f2131d8 100644
--- a/extensions/Wikibase/lib/maintenance/dispatchChanges.php
+++ b/extensions/Wikibase/lib/maintenance/dispatchChanges.php
@@ -418,9 +418,9 @@
,
__METHOD__,
array(
- 'ORDER BY' => 'chd_seen ASC',
+ 'ORDER BY chd_seen ASC',
'FOR UPDATE',
- 'LIMIT' => (int)$this->randomness
+ 'LIMIT ' . (int)$this->randomness
)
);
@@ -860,7 +860,7 @@
// The change is relevant if it alters any
sitelinks referring to $siteID,
// or the item currently links to $siteID.
if ( isset( $linkedItems[$itemId] )
- || $this->isRelevantChange( $change,
$siteID ) ) {
+ || $this->isRelevantChange( $change,
$siteID ) !== null ) {
$filteredChanges[] = $change;
$numberOfChangesFound++;
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index c5640fd..86c90e8 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1329,12 +1329,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "75b3a2284f1780663c54655957db2992d774d7dd"
+ "reference": "7d3a0b11d0321ff09fde1b5692599860fea6496c"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/75b3a2284f1780663c54655957db2992d774d7dd";,
- "reference": "75b3a2284f1780663c54655957db2992d774d7dd",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/7d3a0b11d0321ff09fde1b5692599860fea6496c";,
+ "reference": "7d3a0b11d0321ff09fde1b5692599860fea6496c",
"shasum": ""
},
"require": {
@@ -1362,7 +1362,7 @@
"conflict": {
"mediawiki/mediawiki": "<1.23"
},
- "time": "2015-03-24 14:53:33",
+ "time": "2015-03-25 00:03:14",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/199544
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I81ab3d4f64591c20cad09838198eb75b6030eabd
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.25wmf22
Gerrit-Owner: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
