From c02c962bf06899ebfa73afff9e9f59901d706198 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sat, 9 Sep 2017 14:05:58 -0700 Subject: [PATCH] Remove implicitGroupby() use in ImageListPager Note this only effects wikis with miser mode disabled, so there is less risk of a poor query plan. Change-Id: I692b23f176489b9a0907bcc65b4ca93f10367c48 --- includes/specials/pagers/ImageListPager.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/includes/specials/pagers/ImageListPager.php b/includes/specials/pagers/ImageListPager.php index 813d1d44c0..1c46f4c3c2 100644 --- a/includes/specials/pagers/ImageListPager.php +++ b/includes/specials/pagers/ImageListPager.php @@ -286,13 +286,8 @@ class ImageListPager extends TablePager { } unset( $field ); - $dbr = wfGetDB( DB_REPLICA ); - if ( $dbr->implicitGroupby() ) { - $options = [ 'GROUP BY' => 'img_name' ]; - } else { - $columnlist = preg_grep( '/^img/', array_keys( $this->getFieldNames() ) ); - $options = [ 'GROUP BY' => array_merge( [ 'img_user' ], $columnlist ) ]; - } + $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' ] ]; } -- 2.20.1