mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-27 21:58:52 +00:00
added missing variable to session_end, fixed schema directories within upgrade file.
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3515 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
5c40eb6b78
commit
b0322067b9
3 changed files with 7 additions and 5 deletions
|
@ -329,6 +329,8 @@ function session_end($session_id, $user_id)
|
|||
$cookiedomain = $board_config['cookie_domain'];
|
||||
$cookiesecure = $board_config['cookie_secure'];
|
||||
|
||||
$current_time = time();
|
||||
|
||||
//
|
||||
// Pull cookiedata or grab the URI propagated sid
|
||||
//
|
||||
|
|
|
@ -209,7 +209,7 @@ if (
|
|||
// and ensure that they were trying to register a second time
|
||||
// (Prevents double registrations)
|
||||
//
|
||||
if ( $userdata['session_logged_in'] && $mode =="register" && $username == $userdata['username'])
|
||||
if ( $userdata['session_logged_in'] && $mode == 'register' && $username == $userdata['username'])
|
||||
{
|
||||
message_die(GENERAL_MESSAGE, $lang['Username_taken'], '', __LINE__, __FILE__);
|
||||
}
|
||||
|
|
|
@ -194,7 +194,7 @@ function get_schema()
|
|||
{
|
||||
global $table_prefix;
|
||||
|
||||
$schemafile = file('db/schemas/mysql_schema.sql');
|
||||
$schemafile = file('schemas/mysql_schema.sql');
|
||||
$tabledata = 0;
|
||||
|
||||
for($i=0; $i < count($schemafile); $i++)
|
||||
|
@ -280,7 +280,7 @@ function get_inserts()
|
|||
{
|
||||
global $table_prefix;
|
||||
|
||||
$insertfile = file('db/schemas/mysql_basic.sql');
|
||||
$insertfile = file('schemas/mysql_basic.sql');
|
||||
|
||||
for($i = 0; $i < count($insertfile); $i++)
|
||||
{
|
||||
|
@ -1936,8 +1936,8 @@ if ( !empty($next) )
|
|||
}
|
||||
}
|
||||
|
||||
print "<br />If the upgrade completed without error you may click <a href=\"index.$phpEx\">Here</a> to proceed to the index<br />";
|
||||
print "<br />If the upgrade completed without error you may click <a href=\"./../index.$phpEx\">Here</a> to proceed to the index<br />";
|
||||
|
||||
common_footer();
|
||||
|
||||
?>
|
||||
?>
|
Loading…
Add table
Reference in a new issue