mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity

Prevent incomplete backups stored if option "store and download" is selected and admin cancel download by removing the option. (Bug #20325)

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9417 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2009-03-30 13:52:58 +00:00
parent 6d601d3bfc
commit 1f5fd0b721
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/adm/style/acp_database.html
View File

@ -70,8 +70,8 @@
</dl> </dl>
<dl> <dl>
<dt><label for="where">{L_ACTION}:</label></dt> <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> <dd>
<label><input type="radio" class="radio" name="where" value="store" /> {L_STORE_LOCAL}</label> <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> <label><input type="radio" class="radio" name="where" value="download" /> {L_DOWNLOAD}</label></dd>
</dl> </dl>
<dl> <dl>

1
phpBB/docs/CHANGELOG.html
View File

@ -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] 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] 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] Sort backups by date, newest first (Bug #14818)</li>
<li>[Fix] Prevent incomplete backups stored if option &quot;store and download&quot; 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] 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] 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> <li>[Change] Added new option for merging differences to conflicting files in automatic updater</li>

2
phpBB/includes/acp/acp_database.php
View File

@ -82,6 +82,7 @@ class acp_database
} }
@set_time_limit(1200); @set_time_limit(1200);
@set_time_limit(0);
$time = time(); $time = time();
@ -555,6 +556,7 @@ class base_extractor
function write_end() function write_end()
{ {
static $close; static $close;
if ($this->store) if ($this->store)
{ {
if ($close === null) if ($close === null)