Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/252612
Change subject: Don't use array plus to merge SQL condition arrays
......................................................................
Don't use array plus to merge SQL condition arrays
$conditions can contain an unkeyed value (i.e. its key is zero),
so using + will cause the first unkeyed value in the other array
to be dropped. The dropped value was 'workflow_id = tree_ancestor_id';
dropping that broke the join between the workflow table and the other
tables and caused the workflow_namespace condition to be ignored.
The consequence of this was that the namespace filter in Special:Contributions
wasn't applied to summary edits.
Change-Id: Idc1ff65123c35a9ae3623e744f2964cf2886bbaf
---
M includes/Formatter/ContributionsQuery.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/12/252612/1
diff --git a/includes/Formatter/ContributionsQuery.php
b/includes/Formatter/ContributionsQuery.php
index 8b85adb..972813d 100644
--- a/includes/Formatter/ContributionsQuery.php
+++ b/includes/Formatter/ContributionsQuery.php
@@ -245,11 +245,11 @@
return $dbr->select(
array( 'flow_revision',
'flow_workflow', 'flow_tree_node' ),
array( '*' ),
- $conditions + array(
+ array_merge( $conditions, array(
'workflow_id =
tree_ancestor_id',
'tree_descendant_id =
rev_type_id',
'rev_type' => 'post-summary'
- ),
+ ) ),
__METHOD__,
array(
'LIMIT' => $limit,
--
To view, visit https://gerrit.wikimedia.org/r/252612
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc1ff65123c35a9ae3623e744f2964cf2886bbaf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
