diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2009-08-07 12:50:25 +0000 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2009-08-07 12:50:25 +0000 |
| commit | 090ab9bf0567734c951879b264744d16f41eceb3 (patch) | |
| tree | cfa0726b63689b7038fb122cc53ad1a11db38442 /phpBB/install | |
| parent | 8dcad17d1b938b04546254968c7a76ff39b8332d (diff) | |
| download | forums-090ab9bf0567734c951879b264744d16f41eceb3.tar forums-090ab9bf0567734c951879b264744d16f41eceb3.tar.gz forums-090ab9bf0567734c951879b264744d16f41eceb3.tar.bz2 forums-090ab9bf0567734c951879b264744d16f41eceb3.tar.xz forums-090ab9bf0567734c951879b264744d16f41eceb3.zip | |
Bug #49215 again.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9936 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/install_convert.php | 4 | ||||
| -rw-r--r-- | phpBB/install/install_update.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index 38bfe96fcd..7f1b9de5b6 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -1558,7 +1558,7 @@ class install_convert extends module */ function finish_conversion() { - global $db, $phpbb_root_path, $convert, $config, $language, $user, $template; + global $db, $phpbb_root_path, $phpEx, $convert, $config, $language, $user, $template; $db->sql_query('DELETE FROM ' . CONFIG_TABLE . " WHERE config_name = 'convert_progress' @@ -1567,7 +1567,7 @@ class install_convert extends module OR config_name = 'convert_db_user'"); $db->sql_query('DELETE FROM ' . SESSIONS_TABLE); - @unlink($phpbb_root_path . 'cache/data_global.php'); + @unlink($phpbb_root_path . 'cache/data_global.' . $phpEx); cache_moderators(); // And finally, add a note to the log diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index f73f741fae..a809afd4c7 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -206,7 +206,7 @@ class install_update extends module if (in_array('language/en/install.php', $this->update_info['files'])) { $lang = array(); - include($this->new_location . 'language/en/install.php'); + include($this->new_location . 'language/en/install.' . $phpEx); // only add new keys to user's language in english $new_keys = array_diff(array_keys($lang), array_keys($user->lang)); foreach ($new_keys as $i => $new_key) |