diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-26 12:22:56 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-26 12:22:56 +0000 |
| commit | 52717466fbcc0f25c22c05dbdfaf0aba64a6b5dd (patch) | |
| tree | c807bd2f48b1e37907e9ace5be1d5f980c91fb70 /phpBB/install/install_update.php | |
| parent | 870a3a1d8acc5f3b1632db3210ef499c0a01a4eb (diff) | |
| download | forums-52717466fbcc0f25c22c05dbdfaf0aba64a6b5dd.tar forums-52717466fbcc0f25c22c05dbdfaf0aba64a6b5dd.tar.gz forums-52717466fbcc0f25c22c05dbdfaf0aba64a6b5dd.tar.bz2 forums-52717466fbcc0f25c22c05dbdfaf0aba64a6b5dd.tar.xz forums-52717466fbcc0f25c22c05dbdfaf0aba64a6b5dd.zip | |
some tiny changes
git-svn-id: file:///svn/phpbb/trunk@6656 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/install_update.php')
| -rw-r--r-- | phpBB/install/install_update.php | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 82ee374e52..aea6043f50 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -58,6 +58,9 @@ class install_update extends module var $latest_version; var $current_version; + // Set to false + var $test_update = false; + function install_update(&$p_master) { $this->p_master = &$p_master; @@ -93,7 +96,9 @@ class install_update extends module include_once($phpbb_root_path . 'includes/diff/diff.' . $phpEx); - // Check for user session + /** + * Check for user session + * - commented out for beta3 with "broken" install check routine if (!$user->data['is_registered']) { login_box('', $user->lang['LOGIN_UPDATE_EXPLAIN']); @@ -103,6 +108,7 @@ class install_update extends module { trigger_error($user->lang['NO_AUTH_UPDATE']); } + */ // If we are within the intro page we need to make sure we get up-to-date version info if ($sub == 'intro') @@ -164,6 +170,20 @@ class install_update extends module return; } + // Got the updater template itself updated? If so, we are able to directly use it - but only if all three files are present + if (in_array('adm/style/install_update.html', $this->update_info['files'])) + { + $this->tpl_name = '../../install/update/new/adm/style/install_update'; + } + + // What about the language file? Got it updated? + if (in_array('language/en/install.php', $this->update_info['files'])) + { + $lang = array(); + include('./update/new/language/en/install.php'); + $user->lang = array_merge($user->lang, $lang); + } + // Make sure we stay at the file check if checking the files again if (!empty($_POST['check_again'])) { @@ -670,7 +690,7 @@ class install_update extends module $status = request_var('status', ''); $file = request_var('file', ''); - $diff_mode = request_var('diff_mode', 'side_by_side'); + $diff_mode = request_var('diff_mode', 'inline'); // First of all make sure the file is within our file update list with the correct status $found_entry = array(); @@ -684,7 +704,7 @@ class install_update extends module if (empty($found_entry)) { - trigger_error('File not allowed to be diffed', E_USER_ERROR); + trigger_error($user->lang['FILE_DIFF_NOT_ALLOWED'], E_USER_ERROR); } // If the status is 'up_to_date' then we do not need to show a diff @@ -947,6 +967,11 @@ class install_update extends module $info = explode("\n", $info); $info = trim($info[0]); } + + if ($this->test_update !== false) + { + $info = $this->test_update; + } break; case 'update_info': @@ -963,7 +988,7 @@ class install_update extends module // Adjust the update info file to hold some specific style-related information $info['custom'] = array(); - // Get custom installed styles... + /* Get custom installed styles... $sql = 'SELECT template_name, template_path FROM ' . STYLES_TEMPLATE_TABLE . " WHERE template_name NOT IN ('subSilver', 'BLABLA')"; @@ -990,6 +1015,7 @@ class install_update extends module } } } + */ } break; |