diff options
author | Andreas Fischer <bantu@phpbb.com> | 2015-02-03 17:38:02 +0100 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2015-02-03 17:38:02 +0100 |
commit | 63d863a883e946d881bac30bf409c26c1aa4340c (patch) | |
tree | 2dd0123183c2cecccf2088c87c2fbf745c5c83e5 /phpBB/includes | |
parent | ceaba8aaf94583b437f08f6d004d031b9a9ad345 (diff) | |
parent | 2864e77d6c480f8424de962dd0570185c049a9af (diff) | |
download | forums-63d863a883e946d881bac30bf409c26c1aa4340c.tar forums-63d863a883e946d881bac30bf409c26c1aa4340c.tar.gz forums-63d863a883e946d881bac30bf409c26c1aa4340c.tar.bz2 forums-63d863a883e946d881bac30bf409c26c1aa4340c.tar.xz forums-63d863a883e946d881bac30bf409c26c1aa4340c.zip |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13569] Add missing sql_freeresults and remove unneeded results
Diffstat (limited to 'phpBB/includes')
-rw-r--r-- | phpBB/includes/mcp/mcp_front.php | 2 | ||||
-rw-r--r-- | phpBB/includes/mcp/mcp_main.php | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php index ebcf7ce643..500db55456 100644 --- a/phpBB/includes/mcp/mcp_front.php +++ b/phpBB/includes/mcp/mcp_front.php @@ -234,6 +234,7 @@ function mcp_front_view($id, $mode, $action) 'ATTACH_ICON_IMG' => ($auth->acl_get('u_download') && $auth->acl_get('f_download', $row['forum_id']) && $row['post_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '', )); } + $db->sql_freeresult($result); } $template->assign_vars(array( @@ -290,6 +291,7 @@ function mcp_front_view($id, $mode, $action) $pm_by_id[(int) $row['msg_id']] = $row; $pm_list[] = (int) $row['msg_id']; } + $db->sql_freeresult($result); $address_list = get_recipient_strings($pm_by_id); diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index c084f5af52..8403c3588e 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -1320,6 +1320,7 @@ function mcp_fork_topic($topic_ids) $db->sql_query('INSERT INTO ' . POLL_OPTIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); } + $db->sql_freeresult($result); } $sql = 'SELECT * |