Anomie has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/396019 )

Change subject: ImageListPager: Don't stomp on $join_conds
......................................................................

ImageListPager: Don't stomp on $join_conds

When adding a join to the oldimage table to get counts, don't stomp on
any existing values in $join_conds. Just add the condition.

Bug: T182245
Change-Id: I4cd3332355f9974bdf35dc083be5bba537fcfb5f
---
M includes/specials/pagers/ImageListPager.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/19/396019/1

diff --git a/includes/specials/pagers/ImageListPager.php 
b/includes/specials/pagers/ImageListPager.php
index 1c46f4c..008573b 100644
--- a/includes/specials/pagers/ImageListPager.php
+++ b/includes/specials/pagers/ImageListPager.php
@@ -288,7 +288,7 @@
 
                        $columnlist = preg_grep( '/^img/', array_keys( 
$this->getFieldNames() ) );
                        $options = [ 'GROUP BY' => array_merge( [ 'img_user' ], 
$columnlist ) ];
-                       $join_conds = [ 'oldimage' => [ 'LEFT JOIN', 'oi_name = 
img_name' ] ];
+                       $join_conds['oldimage'] = [ 'LEFT JOIN', 'oi_name = 
img_name' ];
                }
 
                return [

-- 
To view, visit https://gerrit.wikimedia.org/r/396019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4cd3332355f9974bdf35dc083be5bba537fcfb5f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie <bjor...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to