makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source 
* 3.1.x:
  [ticket/13819] Add missing sql_freeresult() to files in includes/

Conflicts:
	phpBB/includes/acp/acp_database.php
This commit is contained in:
Andreas Fischer 2015-05-06 01:05:04 +02:00
commit 636524fa56
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/includes/mcp/mcp_reports.php
View file

@ -491,6 +491,7 @@ function close_report($report_id_list, $mode, $action, $pm = false)
{ {
$post_id_list[] = $row[$id_column]; $post_id_list[] = $row[$id_column];
} }
$db->sql_freeresult($result);
$post_id_list = array_unique($post_id_list); $post_id_list = array_unique($post_id_list);
if ($pm) if ($pm)

1
phpBB/phpbb/db/extractor/postgres_extractor.php
View file

@ -72,6 +72,7 @@ class postgres_extractor extends base_extractor
$this->flush($sql_data . ";\n"); $this->flush($sql_data . ";\n");
} }
} }
$this->db->sql_freeresult($result);
$sql_data = '-- Table: ' . $table_name . "\n"; $sql_data = '-- Table: ' . $table_name . "\n";
$sql_data .= "DROP TABLE $table_name;\n"; $sql_data .= "DROP TABLE $table_name;\n";