diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-01-15 12:36:54 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-01-15 12:36:54 +0100 |
| commit | 1dbc2d621861249a40633012fe33af02c097e69b (patch) | |
| tree | 2264e29c7d678684e78e1436a1604f682e599da0 /phpBB/phpbb/profilefields/lang_helper.php | |
| parent | 7fd5f16fa2aeeaddfe21062ffe3c4052ec5ec6c1 (diff) | |
| download | forums-1dbc2d621861249a40633012fe33af02c097e69b.tar forums-1dbc2d621861249a40633012fe33af02c097e69b.tar.gz forums-1dbc2d621861249a40633012fe33af02c097e69b.tar.bz2 forums-1dbc2d621861249a40633012fe33af02c097e69b.tar.xz forums-1dbc2d621861249a40633012fe33af02c097e69b.zip | |
[ticket/11201] Fix dropdown tests
The error message is now already the language string including the fieldname
and not the language key anymore.
PHPBB3-11201
Diffstat (limited to 'phpBB/phpbb/profilefields/lang_helper.php')
| -rw-r--r-- | phpBB/phpbb/profilefields/lang_helper.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/phpbb/profilefields/lang_helper.php b/phpBB/phpbb/profilefields/lang_helper.php index ddf77f5e42..627c76e76e 100644 --- a/phpBB/phpbb/profilefields/lang_helper.php +++ b/phpBB/phpbb/profilefields/lang_helper.php @@ -79,16 +79,16 @@ class lang_helper */ public function is_set($field_id, $lang_id = null, $field_value = null) { - $is_set = isset($this->lang_helper->options_lang[$field_id]); + $is_set = isset($this->options_lang[$field_id]); if ($is_set && (!is_null($lang_id) || !is_null($field_value))) { - $is_set = isset($this->lang_helper->options_lang[$field_id][$lang_id]); + $is_set = isset($this->options_lang[$field_id][$lang_id]); } if ($is_set && !is_null($field_value)) { - $is_set = isset($this->lang_helper->options_lang[$field_id][$lang_id][$field_value]); + $is_set = isset($this->options_lang[$field_id][$lang_id][$field_value]); } return $is_set; @@ -106,9 +106,9 @@ class lang_helper { if (!is_null($field_value)) { - return $this->lang_helper->options_lang[$field_id][$lang_id]; + return $this->options_lang[$field_id][$lang_id]; } - return $this->lang_helper->options_lang[$field_id][$lang_id][$field_value]; + return $this->options_lang[$field_id][$lang_id][$field_value]; } } |