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

[ticket/11700] Actually "one" in comments is not a class

Browse source 
PHPBB3-11700
This commit is contained in:
Nils Adermann 2013-09-16 03:50:47 +02:00
parent 8fd84ae879
commit 3860b37741
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/phpbb/auth/auth.php
View file

@ -1007,7 +1007,7 @@ class auth
// Successful session creation // Successful session creation
if ($result === true) if ($result === true)
{ {
// If admin re-authentication we remove the old session entry because a new \one has been created... // If admin re-authentication we remove the old session entry because a new one has been created...
if ($admin) if ($admin)
{ {
// the login array is used because the user ids do not differ for re-authentication // the login array is used because the user ids do not differ for re-authentication

2
phpBB/phpbb/db/tools.php
View file

@ -1072,7 +1072,7 @@ class tools
{ {
$new_table_cols[] = 'PRIMARY KEY (' . implode(', ', $sql_schema_changes['primary_key']) . ')'; $new_table_cols[] = 'PRIMARY KEY (' . implode(', ', $sql_schema_changes['primary_key']) . ')';
} }
// Add a new \one or the old primary key // Add a new one or the old primary key
else if ($primary_key !== false) else if ($primary_key !== false)
{ {
$new_table_cols[] = $primary_key; $new_table_cols[] = $primary_key;

6
phpBB/phpbb/session.php
View file

@ -199,7 +199,7 @@ class session
* This is where all session activity begins. We gather various pieces of * This is where all session activity begins. We gather various pieces of
* information from the client and server. We test to see if a session already * information from the client and server. We test to see if a session already
* exists. If it does, fine and dandy. If it doesn't we'll go on to create a * exists. If it does, fine and dandy. If it doesn't we'll go on to create a
* new \one ... pretty logical heh? We also examine the system load (if we're * new one ... pretty logical heh? We also examine the system load (if we're
* running on a system which makes such information readily available) and * running on a system which makes such information readily available) and
* halt if it's above an admin definable limit. * halt if it's above an admin definable limit.
* *
@ -494,7 +494,7 @@ class session
} }
} }
// If we reach here then no (valid) session exists. So we'll create a new \one // If we reach here then no (valid) session exists. So we'll create a new one
return $this->session_create(); return $this->session_create();
} }
@ -801,7 +801,7 @@ class session
// Something quite important: session_page always holds the *last* page visited, except for the *first* visit. // Something quite important: session_page always holds the *last* page visited, except for the *first* visit.
// We are not able to simply have an empty session_page btw, therefore we need to tell phpBB how to detect this special case. // We are not able to simply have an empty session_page btw, therefore we need to tell phpBB how to detect this special case.
// If the session id is empty, we have a completely new \one and will set an "identifier" here. This identifier is able to be checked later. // If the session id is empty, we have a completely new one and will set an "identifier" here. This identifier is able to be checked later.
if (empty($this->data['session_id'])) if (empty($this->data['session_id']))
{ {
// This is a temporary variable, only set for the very first visit // This is a temporary variable, only set for the very first visit