summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-09-17 13:58:59 +0200
committerThomas Bruederli <thomas@roundcube.net>2014-09-18 09:01:30 +0200
commit8ef203827ff6accd8ebf40051f881508815591ac (patch)
tree2ce8755046a351de1479c39af4250499d55aa529 /program
parentd1cd22a6ddb96dadb45385ba1238e30e2b1bd6c6 (diff)
Make noshow attribute for roundcube:label tags actually work as supposed
Diffstat (limited to 'program')
-rw-r--r--program/include/rcmail_output_html.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
index a84824648..0f2a0a6d5 100644
--- a/program/include/rcmail_output_html.php
+++ b/program/include/rcmail_output_html.php
@@ -927,17 +927,17 @@ EOF;
$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':