diff options
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/install_update.html | 17 | ||||
| -rw-r--r-- | phpBB/install/install_update.php | 12 |
2 files changed, 18 insertions, 11 deletions
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index 2dbc0c7c47..c9059d8801 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -2,6 +2,17 @@ <script type="text/javascript"> // <![CDATA[ + function popup(url, width, height, name) + { + if (!name) + { + name = '_popup'; + } + + window.open(url.replace(/&/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width); + return false; + } + function diff_popup(url) { popup(url, 950, 600, '_diff'); @@ -52,7 +63,7 @@ <p>{L_UPDATE_SUCCESS_EXPLAIN}</p> <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> </form> @@ -245,10 +256,6 @@ <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 --> <!-- 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 --> <!-- ENDIF --></dd> - </dl> <!-- IF not files.S_BINARY --> <dl> <dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="3" /> {L_MERGE_NEW_FILE_OPTION}</label></dt> diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 36cb806ca6..320747b60b 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -321,7 +321,7 @@ class install_update extends module $get_new_list = true; } - if (!$get_new_list && $update_list['status'] != 'finished') + if (!$get_new_list && $update_list['status'] != -1) { $get_new_list = true; } @@ -332,7 +332,7 @@ class install_update extends module $cache->put('_update_list', $update_list); // 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&sub=file_check"); 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" $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; } @@ -747,7 +747,7 @@ class install_update extends module } } - $file_list['status'] = 'finished'; + $file_list['status'] = -1; $cache->put('_diff_files', $file_list); if (!empty($_REQUEST['download'])) @@ -1291,7 +1291,7 @@ class install_update extends module $update_list['status']++; } - $update_list['status'] = 'finished'; + $update_list['status'] = -1; /* if (!sizeof($this->update_info['files'])) { return $update_list; |