mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 15:16:16 +02:00
Code Issues Releases Wiki Activity

Bug #49215 again.

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9936 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Andreas Fischer 2009-08-07 12:50:25 +00:00
parent 8dcad17d1b
commit 090ab9bf05
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/install/install_convert.php
View File

@ -1558,7 +1558,7 @@ class install_convert extends module
*/ */
function finish_conversion() 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 . " $db->sql_query('DELETE FROM ' . CONFIG_TABLE . "
WHERE config_name = 'convert_progress' WHERE config_name = 'convert_progress'
@ -1567,7 +1567,7 @@ class install_convert extends module
OR config_name = 'convert_db_user'"); OR config_name = 'convert_db_user'");
$db->sql_query('DELETE FROM ' . SESSIONS_TABLE); $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(); cache_moderators();
// And finally, add a note to the log // And finally, add a note to the log

2
phpBB/install/install_update.php
View File

@ -206,7 +206,7 @@ class install_update extends module
if (in_array('language/en/install.php', $this->update_info['files'])) if (in_array('language/en/install.php', $this->update_info['files']))
{ {
$lang = array(); $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 // only add new keys to user's language in english
$new_keys = array_diff(array_keys($lang), array_keys($user->lang)); $new_keys = array_diff(array_keys($lang), array_keys($user->lang));
foreach ($new_keys as $i => $new_key) foreach ($new_keys as $i => $new_key)