aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-01-03 13:46:47 +0100
committerMarc Alexander <admin@m-a-styles.de>2015-01-03 13:46:47 +0100
commitddceaee772838a98c9de6aa81168a631f85a8a5a (patch)
tree099d8af226faa2ff471012c7c5025cf10d480aed
parentb9a539a06ba46db193c88653e6e6a68421c0a55a (diff)
parent0e0c649477e5ed66f93e1e1a15caeafcf50ae097 (diff)
downloadforums-ddceaee772838a98c9de6aa81168a631f85a8a5a.tar
forums-ddceaee772838a98c9de6aa81168a631f85a8a5a.tar.gz
forums-ddceaee772838a98c9de6aa81168a631f85a8a5a.tar.bz2
forums-ddceaee772838a98c9de6aa81168a631f85a8a5a.tar.xz
forums-ddceaee772838a98c9de6aa81168a631f85a8a5a.zip
Merge branch 'develop-ascraeus' into develop
-rw-r--r--phpBB/includes/functions_convert.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
index 9d480692e9..61ab4721c4 100644
--- a/phpBB/includes/functions_convert.php
+++ b/phpBB/includes/functions_convert.php
@@ -2148,6 +2148,7 @@ function fix_empty_primary_groups()
}
$sql = 'SELECT user_id FROM ' . USER_GROUP_TABLE . ' WHERE group_id = ' . get_group_id('global_moderators');
+ $result = $db->sql_query($sql);
$user_ids = array();
while ($row = $db->sql_fetchrow($result))