makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

added missing variable to session_end, fixed schema directories within upgrade file.

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3515 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2003-02-23 11:59:51 +00:00
parent 5c40eb6b78
commit b0322067b9
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/sessions.php
View file

@ -329,6 +329,8 @@ function session_end($session_id, $user_id)
$cookiedomain = $board_config['cookie_domain']; $cookiedomain = $board_config['cookie_domain'];
$cookiesecure = $board_config['cookie_secure']; $cookiesecure = $board_config['cookie_secure'];
$current_time = time();
// //
// Pull cookiedata or grab the URI propagated sid // Pull cookiedata or grab the URI propagated sid
// //

2
phpBB/includes/usercp_register.php
View file

@ -209,7 +209,7 @@ if (
// and ensure that they were trying to register a second time // and ensure that they were trying to register a second time
// (Prevents double registrations) // (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__); message_die(GENERAL_MESSAGE, $lang['Username_taken'], '', __LINE__, __FILE__);
} }

6
phpBB/install/upgrade.php
View file

@ -194,7 +194,7 @@ function get_schema()
{ {
global $table_prefix; global $table_prefix;
$schemafile = file('db/schemas/mysql_schema.sql'); $schemafile = file('schemas/mysql_schema.sql');
$tabledata = 0; $tabledata = 0;
for($i=0; $i < count($schemafile); $i++) for($i=0; $i < count($schemafile); $i++)
@ -280,7 +280,7 @@ function get_inserts()
{ {
global $table_prefix; global $table_prefix;
$insertfile = file('db/schemas/mysql_basic.sql'); $insertfile = file('schemas/mysql_basic.sql');
for($i = 0; $i < count($insertfile); $i++) for($i = 0; $i < count($insertfile); $i++)
{ {
@ -1936,7 +1936,7 @@ 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(); common_footer();