diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-03-30 13:52:58 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-03-30 13:52:58 +0000 |
| commit | 1f5fd0b721caf8efbd765072c87c0cdf2aead714 (patch) | |
| tree | 6a36ca8f6b3dda31913288415db6307a1cbac701 | |
| parent | 6d601d3bfcd02a5986ed9db48add30d639f4d1cd (diff) | |
| download | forums-1f5fd0b721caf8efbd765072c87c0cdf2aead714.tar forums-1f5fd0b721caf8efbd765072c87c0cdf2aead714.tar.gz forums-1f5fd0b721caf8efbd765072c87c0cdf2aead714.tar.bz2 forums-1f5fd0b721caf8efbd765072c87c0cdf2aead714.tar.xz forums-1f5fd0b721caf8efbd765072c87c0cdf2aead714.zip | |
Prevent incomplete backups stored if option "store and download" 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
| -rw-r--r-- | phpBB/adm/style/acp_database.html | 4 | ||||
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_database.php | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html index ebc76c36a3..e839fb1bda 100644 --- a/phpBB/adm/style/acp_database.html +++ b/phpBB/adm/style/acp_database.html @@ -70,8 +70,8 @@ </dl> <dl> <dt><label for="where">{L_ACTION}:</label></dt> - <dd><label><input type="radio" class="radio" name="where" value="store_and_download" id="where" checked="checked" /> {L_STORE_AND_DOWNLOAD}</label> - <label><input type="radio" class="radio" name="where" value="store" /> {L_STORE_LOCAL}</label> + <dd> + <label><input type="radio" class="radio" name="where" value="store" checked="checked" /> {L_STORE_LOCAL}</label> <label><input type="radio" class="radio" name="where" value="download" /> {L_DOWNLOAD}</label></dd> </dl> <dl> diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 16b4759fd7..d13506b598 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -133,6 +133,7 @@ <li>[Fix] Correctly count topic views for guests visiting the website the first time by entering the topic directly (Bug #43445)</li> <li>[Fix] Fix bug in postgresql db layer for LIMIT ALL clauses (reported by JRSweets)</li> <li>[Fix] Sort backups by date, newest first (Bug #14818)</li> + <li>[Fix] Prevent incomplete backups stored if option "store and download" is selected and admin cancel download by removing the option. (Bug #20325)</li> <li>[Change] Allow download of conflicting file for later reference in automatic updater</li> <li>[Change] Default difference view is now 'inline' instead of 'side by side'</li> <li>[Change] Added new option for merging differences to conflicting files in automatic updater</li> 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) |