diff options
author | Tristan Darricau <github@nicofuma.fr> | 2015-01-20 23:36:23 +0100 |
---|---|---|
committer | Tristan Darricau <github@nicofuma.fr> | 2015-01-20 23:36:23 +0100 |
commit | 9334100cb3f9ee2ecf614308ddf8502c62a243ac (patch) | |
tree | 33923d578c105ef9a5679f7a720a8ce6813f611c | |
parent | a5fae1b1f09358f8a24ff32fc5192395cd314244 (diff) | |
parent | d1bff80dd1a1edb69d71cee0363f013c21eb36a6 (diff) | |
download | forums-9334100cb3f9ee2ecf614308ddf8502c62a243ac.tar forums-9334100cb3f9ee2ecf614308ddf8502c62a243ac.tar.gz forums-9334100cb3f9ee2ecf614308ddf8502c62a243ac.tar.bz2 forums-9334100cb3f9ee2ecf614308ddf8502c62a243ac.tar.xz forums-9334100cb3f9ee2ecf614308ddf8502c62a243ac.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; } } |