aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db/extractor
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2015-05-06 01:05:04 +0200
committerAndreas Fischer <bantu@phpbb.com>2015-05-06 01:06:21 +0200
commit636524fa5686eeb6de6d9fe3c60e8c3e565e09a7 (patch)
tree117d782432c20b87cf50dd1c904f49c39f2da7d8 /phpBB/phpbb/db/extractor
parentde687f32ed8df438cb798d98f1a5dda7a5ac76dc (diff)
parent65b40f15f52ee53c3c5045aa90b59387b793cf59 (diff)
downloadforums-636524fa5686eeb6de6d9fe3c60e8c3e565e09a7.tar
forums-636524fa5686eeb6de6d9fe3c60e8c3e565e09a7.tar.gz
forums-636524fa5686eeb6de6d9fe3c60e8c3e565e09a7.tar.bz2
forums-636524fa5686eeb6de6d9fe3c60e8c3e565e09a7.tar.xz
forums-636524fa5686eeb6de6d9fe3c60e8c3e565e09a7.zip
Merge branch '3.1.x'
* 3.1.x: [ticket/13819] Add missing sql_freeresult() to files in includes/ Conflicts: phpBB/includes/acp/acp_database.php
Diffstat (limited to 'phpBB/phpbb/db/extractor')
-rw-r--r--phpBB/phpbb/db/extractor/postgres_extractor.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/extractor/postgres_extractor.php b/phpBB/phpbb/db/extractor/postgres_extractor.php
index 9eff1f568d..a98e39621c 100644
--- a/phpBB/phpbb/db/extractor/postgres_extractor.php
+++ b/phpBB/phpbb/db/extractor/postgres_extractor.php
@@ -72,6 +72,7 @@ class postgres_extractor extends base_extractor
$this->flush($sql_data . ";\n");
}
}
+ $this->db->sql_freeresult($result);
$sql_data = '-- Table: ' . $table_name . "\n";
$sql_data .= "DROP TABLE $table_name;\n";