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

ok, fought #14735 with the help from paul.

Browse source 
git-svn-id: file:///svn/phpbb/trunk@8189 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-10-14 21:26:07 +00:00
parent b3dbe946cd
commit 15dcba000d
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
phpBB/adm/style/install_update.html
View file

@ -2,6 +2,17 @@
<script type="text/javascript"> <script type="text/javascript">
// <![CDATA[ // <![CDATA[
function popup(url, width, height, name)
{
if (!name)
{
name = '_popup';
}
window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
return false;
}
function diff_popup(url) function diff_popup(url)
{ {
popup(url, 950, 600, '_diff'); popup(url, 950, 600, '_diff');
@ -52,7 +63,7 @@
<p>{L_UPDATE_SUCCESS_EXPLAIN}</p> <p>{L_UPDATE_SUCCESS_EXPLAIN}</p>
<fieldset class="submit-buttons"> <fieldset class="submit-buttons">
<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES_AGAIN}" /> <input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
</fieldset> </fieldset>
</form> </form>
@ -244,10 +255,6 @@
<dl> <dl>
<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt> <dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd> <dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
</dl>
<dl>
<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
</dl> </dl>
<!-- IF not files.S_BINARY --> <!-- IF not files.S_BINARY -->
<dl> <dl>

12
phpBB/install/install_update.php
View file

@ -321,7 +321,7 @@ class install_update extends module
$get_new_list = true; $get_new_list = true;
} }
if (!$get_new_list && $update_list['status'] != 'finished') if (!$get_new_list && $update_list['status'] != -1)
{ {
$get_new_list = true; $get_new_list = true;
} }
@ -332,7 +332,7 @@ class install_update extends module
$cache->put('_update_list', $update_list); $cache->put('_update_list', $update_list);
// Refresh the page if we are still not finished... // Refresh the page if we are still not finished...
if ($update_list['status'] != 'finished') if ($update_list['status'] != -1)
{ {
$refresh_url = append_sid($this->p_master->module_url, "mode=$mode&amp;sub=file_check"); $refresh_url = append_sid($this->p_master->module_url, "mode=$mode&amp;sub=file_check");
meta_refresh(2, $refresh_url); meta_refresh(2, $refresh_url);
@ -604,9 +604,9 @@ class install_update extends module
// Before we do anything, let us diff the files and store the raw file information "somewhere" // Before we do anything, let us diff the files and store the raw file information "somewhere"
$get_files = false; $get_files = false;
$file_list = $cache->get('_diff_files'); $file_list = false; //$cache->get('_diff_files');
if ($file_list === false || $file_list['status'] != 'finished') if ($file_list === false || $file_list['status'] != -1)
{ {
$get_files = true; $get_files = true;
} }
@ -747,7 +747,7 @@ class install_update extends module
} }
} }
$file_list['status'] = 'finished'; $file_list['status'] = -1;
$cache->put('_diff_files', $file_list); $cache->put('_diff_files', $file_list);
if (!empty($_REQUEST['download'])) if (!empty($_REQUEST['download']))
@ -1291,7 +1291,7 @@ class install_update extends module
$update_list['status']++; $update_list['status']++;
} }
$update_list['status'] = 'finished'; $update_list['status'] = -1;
/* if (!sizeof($this->update_info['files'])) /* if (!sizeof($this->update_info['files']))
{ {
return $update_list; return $update_list;