diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-03-22 15:15:20 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-03-22 15:15:20 +0000 |
| commit | 3ff475bcbba49cf55e7f4e803f7d16f7b0c93759 (patch) | |
| tree | 493b39b0d9ccc9790bf9fe93ddacd7caf71f6477 /phpBB/install/install_update.php | |
| parent | d8013e9c75eed6f9aed156029685c7bfb0fc9252 (diff) | |
| download | forums-3ff475bcbba49cf55e7f4e803f7d16f7b0c93759.tar forums-3ff475bcbba49cf55e7f4e803f7d16f7b0c93759.tar.gz forums-3ff475bcbba49cf55e7f4e803f7d16f7b0c93759.tar.bz2 forums-3ff475bcbba49cf55e7f4e803f7d16f7b0c93759.tar.xz forums-3ff475bcbba49cf55e7f4e803f7d16f7b0c93759.zip | |
some fixes... hopefully not breaking something. :o
git-svn-id: file:///svn/phpbb/trunk@7216 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/install_update.php')
| -rw-r--r-- | phpBB/install/install_update.php | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 125c5c3fd5..75f4fc4a56 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -112,20 +112,6 @@ class install_update extends module $user->session_begin(); $auth->acl($user->data); - // Beta4 and below are having a bug displaying an error if the install directory is present. - // This bug got fixed, but we need to get around it by using a tiny 'hack'. - if (!defined('DEBUG_EXTRA')) - { - if (version_compare(strtolower($config['version']), '3.0.b4', '<=')) - { - @define('DEBUG_EXTRA', true); - } - else if (!empty($config['version_update_from']) && version_compare(strtolower($config['version_update_from']), '3.0.b4', '<=')) - { - @define('DEBUG_EXTRA', true); - } - } - $user->setup('install'); // If we are within the intro page we need to make sure we get up-to-date version info @@ -281,7 +267,7 @@ class install_update extends module $template->assign_vars(array( 'S_DB_UPDATE' => true, 'S_DB_UPDATE_FINISHED' => ($config['version'] == $this->latest_version) ? true : false, - 'U_DB_UPDATE' => $phpbb_root_path . 'install/database_update.' . $phpEx . '?type=1', + 'U_DB_UPDATE' => append_sid($phpbb_root_path . 'install/database_update.' . $phpEx, 'type=1&language=' . $language), 'U_DB_UPDATE_ACTION' => append_sid($this->p_master->module_url, "mode=$mode&sub=update_db"), 'U_ACTION' => append_sid($this->p_master->module_url, "mode=$mode&sub=file_check"), )); @@ -1190,7 +1176,7 @@ class install_update extends module /* Get custom installed styles... $sql = 'SELECT template_name, template_path FROM ' . STYLES_TEMPLATE_TABLE . " - WHERE template_name NOT IN ('subSilver', 'BLABLA')"; + WHERE LOWER(template_name) NOT IN ('subsilver', 'prosilver')"; $result = $db->sql_query($sql); $templates = array(); @@ -1205,7 +1191,7 @@ class install_update extends module foreach ($info['files'] as $filename) { // Template update? - if (strpos($filename, 'styles/subSilver/template/') === 0) + if (strpos(strtolower($filename), 'styles/subsilver/template/') === 0) { foreach ($templates as $row) { |