diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2014-09-17 13:58:59 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2014-09-17 13:58:59 +0200 |
| commit | a5ce2d8ae28a9b086e7f445b27d24343f9a8a348 (patch) | |
| tree | ae97ca53d9542363abf6a537adf9836435ff3ba7 | |
| parent | e1db66a4b46f38522f8faecf38d0c49035d9bd14 (diff) | |
Make noshow attribute for roundcube:label tags actually work as supposed
| -rw-r--r-- | program/include/rcmail_output_html.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index d4f918506..850075fcf 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -870,17 +870,17 @@ class rcmail_output_html extends rcmail_output $attrib['name'] = $this->eval_expression($attrib['expression']); if ($attrib['name'] || $attrib['command']) { - // @FIXME: 'noshow' is useless, remove? - if ($attrib['noshow']) { - return ''; - } - $vars = $attrib + array('product' => $this->config->get('product_name')); unset($vars['name'], $vars['command']); $label = $this->app->gettext($attrib + array('vars' => $vars)); $quoting = !empty($attrib['quoting']) ? strtolower($attrib['quoting']) : (rcube_utils::get_boolean((string)$attrib['html']) ? 'no' : ''); + // 'noshow' can be used in skins to define new labels + if ($attrib['noshow']) { + return ''; + } + switch ($quoting) { case 'no': case 'raw': |