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 | |
| 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
| -rw-r--r-- | phpBB/includes/mcp/mcp_front.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_main.php | 1 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/config/db_text.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/notification/type/post.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/notification/type/topic.php | 1 |
6 files changed, 7 insertions, 2 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 * diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 819f5bec9e..e5e0048f29 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1964,7 +1964,7 @@ class install_install extends module 'bot_ip' => (string) $bot_ary[1], )); - $result = $db->sql_query($sql); + $db->sql_query($sql); } } diff --git a/phpBB/phpbb/config/db_text.php b/phpBB/phpbb/config/db_text.php index b1e3ef5da4..ddc7c9aef0 100644 --- a/phpBB/phpbb/config/db_text.php +++ b/phpBB/phpbb/config/db_text.php @@ -154,6 +154,6 @@ class db_text $sql = 'DELETE FROM ' . $this->table . ' WHERE ' . $this->db->sql_in_set('config_name', $keys, false, true); - $result = $this->db->sql_query($sql); + $this->db->sql_query($sql); } } diff --git a/phpBB/phpbb/notification/type/post.php b/phpBB/phpbb/notification/type/post.php index d9e74f2e95..421eff6372 100644 --- a/phpBB/phpbb/notification/type/post.php +++ b/phpBB/phpbb/notification/type/post.php @@ -357,6 +357,7 @@ class post extends \phpbb\notification\type\base { $tracking_data[$row['user_id']] = $row['mark_time']; } + $this->db->sql_freeresult($result); return $tracking_data; } diff --git a/phpBB/phpbb/notification/type/topic.php b/phpBB/phpbb/notification/type/topic.php index cf0ec77099..5f57087b73 100644 --- a/phpBB/phpbb/notification/type/topic.php +++ b/phpBB/phpbb/notification/type/topic.php @@ -257,6 +257,7 @@ class topic extends \phpbb\notification\type\base { $tracking_data[$row['user_id']] = $row['mark_time']; } + $this->db->sql_freeresult($result); return $tracking_data; } |