aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-03-30 13:52:58 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-03-30 13:52:58 +0000
commit1f5fd0b721caf8efbd765072c87c0cdf2aead714 (patch)
tree6a36ca8f6b3dda31913288415db6307a1cbac701 /phpBB/includes
parent6d601d3bfcd02a5986ed9db48add30d639f4d1cd (diff)
downloadforums-1f5fd0b721caf8efbd765072c87c0cdf2aead714.tar
forums-1f5fd0b721caf8efbd765072c87c0cdf2aead714.tar.gz
forums-1f5fd0b721caf8efbd765072c87c0cdf2aead714.tar.bz2
forums-1f5fd0b721caf8efbd765072c87c0cdf2aead714.tar.xz
forums-1f5fd0b721caf8efbd765072c87c0cdf2aead714.zip
Prevent incomplete backups stored if option &quot;store and download&quot; is selected and admin cancel download by removing the option. (Bug #20325)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9417 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_database.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php
index 06425c4a1e..856b867c9a 100644
--- a/phpBB/includes/acp/acp_database.php
+++ b/phpBB/includes/acp/acp_database.php
@@ -82,6 +82,7 @@ class acp_database
}
@set_time_limit(1200);
+ @set_time_limit(0);
$time = time();
@@ -555,6 +556,7 @@ class base_extractor
function write_end()
{
static $close;
+
if ($this->store)
{
if ($close === null)