aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-06-15 17:44:19 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-06-15 17:44:19 +0200
commita0d2c6ab140445104b3c22d307ab37723744b721 (patch)
treeb16cf4716864c99cf9340eb243283e72c5f793c4
parentbf8b8de862d176cc234c70d667cd80ebe0d4772d (diff)
parentad11925c7730e4f3c6b1cffe46c6ba531f04f4d9 (diff)
downloadforums-a0d2c6ab140445104b3c22d307ab37723744b721.tar
forums-a0d2c6ab140445104b3c22d307ab37723744b721.tar.gz
forums-a0d2c6ab140445104b3c22d307ab37723744b721.tar.bz2
forums-a0d2c6ab140445104b3c22d307ab37723744b721.tar.xz
forums-a0d2c6ab140445104b3c22d307ab37723744b721.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/12712] Remove unneeded GROUP BY clause to fix query for mssql
-rw-r--r--phpBB/phpbb/db/migration/data/v310/passwords_convert_p1.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/passwords_convert_p1.php b/phpBB/phpbb/db/migration/data/v310/passwords_convert_p1.php
index 004d94d8bd..aad8e44681 100644
--- a/phpBB/phpbb/db/migration/data/v310/passwords_convert_p1.php
+++ b/phpBB/phpbb/db/migration/data/v310/passwords_convert_p1.php
@@ -42,7 +42,6 @@ class passwords_convert_p1 extends \phpbb\db\migration\migration
$sql = 'SELECT user_password, user_id
FROM ' . $this->table_prefix . 'users
WHERE user_pass_convert = 1
- GROUP BY user_id
ORDER BY user_id';
$result = $this->db->sql_query_limit($sql, $limit, $start);