aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-11-18 13:12:08 +0100
committerMarc Alexander <admin@m-a-styles.de>2014-11-18 13:12:08 +0100
commit19a47c7bac646fc07d7528aa1ef3f625cacd5fe9 (patch)
treec01493fb99300d3522732dbf60073010b5286d6e /phpBB/includes
parent2e467c8569a603182c33dcb999ebbfcdd0be3fa2 (diff)
parentb84d151afa0a382396827a74bc8e8b706e5f5fd5 (diff)
downloadforums-19a47c7bac646fc07d7528aa1ef3f625cacd5fe9.tar
forums-19a47c7bac646fc07d7528aa1ef3f625cacd5fe9.tar.gz
forums-19a47c7bac646fc07d7528aa1ef3f625cacd5fe9.tar.bz2
forums-19a47c7bac646fc07d7528aa1ef3f625cacd5fe9.tar.xz
forums-19a47c7bac646fc07d7528aa1ef3f625cacd5fe9.zip
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions_admin.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index e3e8657afb..5ddaf31cf5 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2512,6 +2512,7 @@ function phpbb_cache_moderators($db, $cache, $auth)
{
$usernames_ary[$row['user_id']] = $row['username'];
}
+ $db->sql_freeresult($result);
foreach ($hold_ary as $user_id => $forum_id_ary)
{
@@ -2806,6 +2807,7 @@ function view_inactive_users(&$users, &$user_count, $limit = 0, $offset = 0, $li
$users[] = $row;
}
+ $db->sql_freeresult($result);
return $offset;
}