diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php index dcb972d119..860c7a3614 100644 --- a/phpBB/includes/db/oracle.php +++ b/phpBB/includes/db/oracle.php @@ -46,7 +46,7 @@ class dbal_oracle extends dbal */ function sql_server_info() { - return 'Oracle ' . @ociserverversion($this->db_connect_id); + return @ociserverversion($this->db_connect_id); } /** diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 5c2d77ced0..5aadb5017e 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1580,7 +1580,18 @@ function redirect($url, $return = false) if (@preg_match('#Microsoft|WebSTAR|Xitami#', getenv('SERVER_SOFTWARE'))) { header('Refresh: 0; URL=' . $url); - echo 'Redirect
' . sprintf($user->lang['URL_REDIRECT'], '', '') . '
'; + + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo '' . $user->lang['REDIRECT'] . ''; + echo ''; + echo ''; + echo '
' . sprintf($user->lang['URL_REDIRECT'], '', '') . '
'; + echo ''; + echo ''; exit; } diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 4d8fc449a0..9870b47706 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -411,7 +411,7 @@ $errored = false;

:: sql_layer; ?>
sql_query($sql); while ($row = $db->sql_fetchrow($result)) { + $sql = 'UPDATE ' . USERS_TABLE . " + SET username_clean = '" . $db->sql_escape(utf8_clean_string($row['username'])) . "'"; + if ($row['user_email']) { - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_email_hash = ' . (crc32($row['user_email']) . strlen($row['user_email'])) . ' - WHERE user_id = ' . $row['user_id']; - _sql($sql, $errored, $error_ary); + $sql .= ', user_email_hash = ' . (crc32($row['user_email']) . strlen($row['user_email'])); } + + $sql .= ' WHERE user_id = ' . $row['user_id']; + _sql($sql, $errored, $error_ary); } $db->sql_freeresult($result); @@ -1355,6 +1360,12 @@ function add_bots() $db->sql_query($sql); } } + else + { + // If the old bots are missing we can safely assume the user tries to execute the database update twice and + // fiddled around... + return; + } if (!function_exists('user_add')) { diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index b6bf1dd03d..ba80f40eb2 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -416,11 +416,12 @@ class install_install extends module $fp = @fopen($phpbb_root_path . $dir . 'test_lock', 'wb'); if ($fp !== false) { - @unlink($phpbb_root_path . $dir . 'test_lock'); $write = true; } @fclose($fp); + @unlink($phpbb_root_path . $dir . 'test_lock'); + $passed['files'] = ($exists && $write && $passed['files']) ? true : false; $exists = ($exists) ? '' . $lang['FOUND'] . '' : '' . $lang['NOT_FOUND'] . ''; diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 3f00ca609b..6d2220ded9 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -406,6 +406,7 @@ $lang = array_merge($lang, array( 'READ_PROFILE' => 'Profile', 'REASON' => 'Reason', 'RECORD_ONLINE_USERS' => 'Most users ever online was %1$s on %2$s', + 'REDIRECT' => 'Redirect', 'REDIRECTS' => 'Total redirects', 'REGISTER' => 'Register', 'REGISTERED_USERS' => 'Registered users:',