diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2015-01-20 23:37:38 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2015-01-20 23:37:38 +0100 |
| commit | f8c34403445fade6dd80e7edab1d7d2b3f5b4662 (patch) | |
| tree | 56a5cff03f7a153a405064264e738231132d9df4 | |
| parent | b566686b5161e699f8376b0463960a9ffb3812b6 (diff) | |
| parent | d1bff80dd1a1edb69d71cee0363f013c21eb36a6 (diff) | |
| download | forums-f8c34403445fade6dd80e7edab1d7d2b3f5b4662.tar forums-f8c34403445fade6dd80e7edab1d7d2b3f5b4662.tar.gz forums-f8c34403445fade6dd80e7edab1d7d2b3f5b4662.tar.bz2 forums-f8c34403445fade6dd80e7edab1d7d2b3f5b4662.tar.xz forums-f8c34403445fade6dd80e7edab1d7d2b3f5b4662.zip | |
Merge pull request #3313 from nickvergessen/ticket/13528
[ticket/13528] Return correct translation instead of is_set()
* nickvergessen/ticket/13528:
[ticket/13528] Return correct translation instead of is_set()
| -rw-r--r-- | phpBB/phpbb/profilefields/type/type_bool.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/profilefields/type/type_bool.php b/phpBB/phpbb/profilefields/type/type_bool.php index 77eedcbd04..f6f3f17a6c 100644 --- a/phpBB/phpbb/profilefields/type/type_bool.php +++ b/phpBB/phpbb/profilefields/type/type_bool.php @@ -173,7 +173,7 @@ class type_bool extends type_base } else { - return $this->lang_helper->is_set($field_id, $lang_id, $field_value + 1); + return $this->lang_helper->is_set($field_id, $lang_id, $field_value + 1) ? $this->lang_helper->get($field_id, $lang_id, $field_value + 1) : null; } } |