Pass attributes as vars to label

1 files changed, 3 insertions, 1 deletions

diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index b9a43d3f1..f5c741fc5 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -681,7 +681,9 @@ class rcube_template extends rcube_html_page
             // show a label
             case 'label':
                 if ($attrib['name'] || $attrib['command']) {
-                    $label = rcube_label($attrib + array('vars' => array('product' => $this->config['product_name'])));
+                    $vars = $attrib + array('product' => $this->config['product_name']);
+                    unset($vars['name'], $vars['command']);
+                    $label = rcube_label($attrib + array('vars' => $vars));
                     return !$attrbi['noshow'] ? Q($label) : '';
                 }
                 break;