- Fix regression in template expressions, don't allow '-' character in env/request/cookie name

git-svn-id: https://svn.roundcube.net/trunk@3314 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 3 insertions, 3 deletions

diff --git a/roundcubemail/program/include/rcube_template.php b/roundcubemail/program/include/rcube_template.php
index 5272ace20..f8f4963ba 100755
--- a/roundcubemail/program/include/rcube_template.php
+++ b/roundcubemail/program/include/rcube_template.php
@@ -563,9 +563,9 @@ class rcube_template extends rcube_html_page
             array(
                 '/session:([a-z0-9_]+)/i',
                 '/config:([a-z0-9_]+)(:([a-z0-9_]+))?/i',
-                '/env:([a-z0-9_-]+)/i',
-                '/request:([a-z0-9_-]+)/i',
-                '/cookie:([a-z0-9_-]+)/i',
+                '/env:([a-z0-9_]+)/i',
+                '/request:([a-z0-9_]+)/i',
+                '/cookie:([a-z0-9_]+)/i',
                 '/browser:([a-z0-9_]+)/i'
             ),
             array(