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

15 years ago · 40353f1a6c
parent 44c57afde1
commit 40353f1a6c
1 changed files with 3 additions and 3 deletions
--- a/program/include/rcube_template.php
+++ b/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',
+                '/env:([a-z0-9_]+)/i',
-                '/request:([a-z0-9_-]+)/i',
+                '/request:([a-z0-9_]+)/i',
-                '/cookie:([a-z0-9_-]+)/i',
+                '/cookie:([a-z0-9_]+)/i',
                '/browser:([a-z0-9_]+)/i'
            ),
            array(