diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-12-23 02:24:11 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-12-25 01:51:20 -0500 |
| commit | 38c2d4da35b6c00e2ef2f6b271eda2c020974eee (patch) | |
| tree | 5da6aba2bedc34809003c52fd3e7911cf4b34cb4 /phpBB/includes/session.php | |
| parent | 37fa5e56f3e2cc4be6978889cf2c6fe31bf5bf1b (diff) | |
| download | forums-38c2d4da35b6c00e2ef2f6b271eda2c020974eee.tar forums-38c2d4da35b6c00e2ef2f6b271eda2c020974eee.tar.gz forums-38c2d4da35b6c00e2ef2f6b271eda2c020974eee.tar.bz2 forums-38c2d4da35b6c00e2ef2f6b271eda2c020974eee.tar.xz forums-38c2d4da35b6c00e2ef2f6b271eda2c020974eee.zip | |
[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
Diffstat (limited to 'phpBB/includes/session.php')
| -rw-r--r-- | phpBB/includes/session.php | 8 |
1 files changed, 4 insertions, 4 deletions
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; |