Author: bantu
Date: Fri Aug 7 13:50:25 2009
New Revision: 9936
Log:
Bug #49215 again.
Modified:
branches/phpBB-3_0_0/phpBB/install/install_convert.php
branches/phpBB-3_0_0/phpBB/install/install_update.php
Modified: branches/phpBB-3_0_0/phpBB/install/install_convert.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/install_convert.php (original)
--- branches/phpBB-3_0_0/phpBB/install/install_convert.php Fri Aug 7 13:50:25 2009
***************
*** 1558,1564 ****
*/
function finish_conversion()
{
! global $db, $phpbb_root_path, $convert, $config, $language, $user, $template;
$db->sql_query('DELETE FROM ' . CONFIG_TABLE . "
WHERE config_name = 'convert_progress'
--- 1558,1564 ----
*/
function finish_conversion()
{
! global $db, $phpbb_root_path, $phpEx, $convert, $config, $language, $user, $template;
$db->sql_query('DELETE FROM ' . CONFIG_TABLE . "
WHERE config_name = 'convert_progress'
***************
*** 1567,1573 ****
OR config_name = 'convert_db_user'");
$db->sql_query('DELETE FROM ' . SESSIONS_TABLE);
! @unlink($phpbb_root_path . 'cache/data_global.php');
cache_moderators();
// And finally, add a note to the log
--- 1567,1573 ----
OR config_name = 'convert_db_user'");
$db->sql_query('DELETE FROM ' . SESSIONS_TABLE);
! @unlink($phpbb_root_path . 'cache/data_global.' . $phpEx);
cache_moderators();
// And finally, add a note to the log
Modified: branches/phpBB-3_0_0/phpBB/install/install_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/install_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/install_update.php Fri Aug 7 13:50:25 2009
***************
*** 206,212 ****
if (in_array('language/en/install.php', $this->update_info['files']))
{
$lang = array();
! include($this->new_location . 'language/en/install.php');
// 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)
--- 206,212 ----
if (in_array('language/en/install.php', $this->update_info['files']))
{
$lang = array();
! 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)
|
