mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-23 10:01:55 +02:00
[ticket/10428] Compare $data to false strictly.
Users may pass 0 or '' for $data, this should cause the user-specified $data code path to be taken. PHPBB3-10428
This commit is contained in:
@@ -2345,7 +2345,7 @@ class acp_users
|
||||
{
|
||||
global $user;
|
||||
|
||||
$var = ($data) ? $data : $user_row['user_options'];
|
||||
$var = ($data !== false) ? $data : $user_row['user_options'];
|
||||
|
||||
if ($value && !($var & 1 << $user->keyoptions[$key]))
|
||||
{
|
||||
@@ -2357,10 +2357,10 @@ class acp_users
|
||||
}
|
||||
else
|
||||
{
|
||||
return ($data) ? $var : false;
|
||||
return ($data !== false) ? $var : false;
|
||||
}
|
||||
|
||||
if (!$data)
|
||||
if ($data === false)
|
||||
{
|
||||
$user_row['user_options'] = $var;
|
||||
return true;
|
||||
@@ -2378,7 +2378,7 @@ class acp_users
|
||||
{
|
||||
global $user;
|
||||
|
||||
$var = ($data) ? $data : $user_row['user_options'];
|
||||
$var = ($data !== false) ? $data : $user_row['user_options'];
|
||||
return ($var & 1 << $user->keyoptions[$key]) ? true : false;
|
||||
}
|
||||
}
|
||||
|
@@ -2343,7 +2343,7 @@ class user extends session
|
||||
{
|
||||
if (!isset($this->keyvalues[$key]))
|
||||
{
|
||||
$var = ($data) ? $data : $this->data['user_options'];
|
||||
$var = ($data !== false) ? $data : $this->data['user_options'];
|
||||
$this->keyvalues[$key] = ($var & 1 << $this->keyoptions[$key]) ? true : false;
|
||||
}
|
||||
|
||||
@@ -2355,7 +2355,7 @@ class user extends session
|
||||
*/
|
||||
function optionset($key, $value, $data = false)
|
||||
{
|
||||
$var = ($data) ? $data : $this->data['user_options'];
|
||||
$var = ($data !== false) ? $data : $this->data['user_options'];
|
||||
|
||||
if ($value && !($var & 1 << $this->keyoptions[$key]))
|
||||
{
|
||||
@@ -2367,10 +2367,10 @@ class user extends session
|
||||
}
|
||||
else
|
||||
{
|
||||
return ($data) ? $var : false;
|
||||
return ($data !== false) ? $var : false;
|
||||
}
|
||||
|
||||
if (!$data)
|
||||
if ($data === false)
|
||||
{
|
||||
$this->data['user_options'] = $var;
|
||||
return true;
|
||||
|
Reference in New Issue
Block a user