diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-12-23 02:29:48 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-12-25 01:51:32 -0500 |
| commit | 16ae99eec8e34ec6d542c1e4d82bd288bc0d0026 (patch) | |
| tree | 968bc0723007a1660ffd29603060a95a9d787976 /phpBB/includes/session.php | |
| parent | 38c2d4da35b6c00e2ef2f6b271eda2c020974eee (diff) | |
| download | forums-16ae99eec8e34ec6d542c1e4d82bd288bc0d0026.tar forums-16ae99eec8e34ec6d542c1e4d82bd288bc0d0026.tar.gz forums-16ae99eec8e34ec6d542c1e4d82bd288bc0d0026.tar.bz2 forums-16ae99eec8e34ec6d542c1e4d82bd288bc0d0026.tar.xz forums-16ae99eec8e34ec6d542c1e4d82bd288bc0d0026.zip | |
[ticket/10428] Dispose of $this->keyvalues cache for optionget.
It does not work properly when custom $data is provided, and
making it work will make the code so complicated that any benefits
from having this cache in the first place will be nullified.
Just get rid of it.
PHPBB3-10428
Diffstat (limited to 'phpBB/includes/session.php')
| -rw-r--r-- | phpBB/includes/session.php | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 50b6ac7406..d988426a87 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1507,7 +1507,6 @@ class user extends session // Able to add new options (up to id 31) var $keyoptions = array('viewimg' => 0, 'viewflash' => 1, 'viewsmilies' => 2, 'viewsigs' => 3, 'viewavatars' => 4, 'viewcensors' => 5, 'attachsig' => 6, 'bbcode' => 8, 'smilies' => 9, 'popuppm' => 10, 'sig_bbcode' => 15, 'sig_smilies' => 16, 'sig_links' => 17); - var $keyvalues = array(); /** * Constructor to set the lang path @@ -2341,13 +2340,8 @@ class user extends session */ function optionget($key, $data = false) { - if (!isset($this->keyvalues[$key])) - { - $var = ($data !== false) ? $data : $this->data['user_options']; - $this->keyvalues[$key] = ($var & 1 << $this->keyoptions[$key]) ? true : false; - } - - return $this->keyvalues[$key]; + $var = ($data !== false) ? $data : $this->data['user_options']; + return ($var & 1 << $this->keyoptions[$key]) ? true : false; } /** |