mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 07:07:51 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* develop-ascraeus:
  [ticket/13569] Add missing sql_freeresults and remove unneeded results
This commit is contained in:
Andreas Fischer 2015-02-03 17:38:02 +01:00
commit 63d863a883
6 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/mcp/mcp_front.php
View File

@ -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);

1
phpBB/includes/mcp/mcp_main.php
View File

@ -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 *

2
phpBB/install/install_install.php
View File

@ -1964,7 +1964,7 @@ class install_install extends module
'bot_ip' => (string) $bot_ary[1],
));
$result = $db->sql_query($sql);
$db->sql_query($sql);
}
}

2
phpBB/phpbb/config/db_text.php
View File

@ -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);
}
}

1
phpBB/phpbb/notification/type/post.php
View File

@ -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;
}

1
phpBB/phpbb/notification/type/topic.php
View File

@ -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;
}