aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/includes/acp/acp_users.php8
-rw-r--r--phpBB/includes/session.php8
2 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 4f58434a43..724d450c99 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -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;
}
}
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index caadcbafaa..50b6ac7406 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -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;