diff options
| author | emkael <emkael@tlen.pl> | 2016-05-09 09:51:29 +0200 |
|---|---|---|
| committer | emkael <emkael@tlen.pl> | 2016-05-09 12:38:03 +0200 |
| commit | 691fcc1f8ce65f41db017d35259e0060c343190d (patch) | |
| tree | dc15aec0e9828d2d54c16a024f674b7e8aaed9cd /lib/prado/framework/Web/UI | |
| parent | 267d16fe0bf60b85a44390ff99b57bca67c2d616 (diff) | |
* upgrade to Prado 3.3.1-rbab7fd6
Diffstat (limited to 'lib/prado/framework/Web/UI')
| -rw-r--r-- | lib/prado/framework/Web/UI/TTemplateManager.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/prado/framework/Web/UI/TTemplateManager.php b/lib/prado/framework/Web/UI/TTemplateManager.php index 49c619f..b6eddab 100644 --- a/lib/prado/framework/Web/UI/TTemplateManager.php +++ b/lib/prado/framework/Web/UI/TTemplateManager.php @@ -169,12 +169,12 @@ class TTemplate extends TApplicationComponent implements ITemplate * '<!--.*?--!>' - template comments * '<!--.*?-->' - HTML comments * '<\/?com:([\w\.]+)((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?"|\s*[\w\.]+\s*=\s*<%.*?%>)*)\s*\/?>' - component tags - * '<\/?prop:([\w\.]+)\s*>' - property tags + * '<\/?prop:([\w\.\-]+)\s*>' - property tags * '<%@\s*((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?")*)\s*%>' - directives * '<%[%#~\/\\$=\\[](.*?)%>' - expressions - * '<prop:([\w\.]+)((?:\s*[\w\.]+=\'.*?\'|\s*[\w\.]+=".*?"|\s*[\w\.]+=<%.*?%>)*)\s*\/>' - group subproperty tags + * '<prop:([\w\.\-]+)((?:\s*[\w\.\-]+=\'.*?\'|\s*[\w\.\-]+=".*?"|\s*[\w\.\-]+=<%.*?%>)*)\s*\/>' - group subproperty tags */ - const REGEX_RULES='/<!--.*?--!>|<!---.*?--->|<\/?com:([\w\.]+)((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?"|\s*[\w\.]+\s*=\s*<%.*?%>)*)\s*\/?>|<\/?prop:([\w\.]+)\s*>|<%@\s*((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?")*)\s*%>|<%[%#~\/\\$=\\[](.*?)%>|<prop:([\w\.]+)((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?"|\s*[\w\.]+\s*=\s*<%.*?%>)*)\s*\/>/msS'; + const REGEX_RULES='/<!--.*?--!>|<!---.*?--->|<\/?com:([\w\.]+)((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?"|\s*[\w\.]+\s*=\s*<%.*?%>)*)\s*\/?>|<\/?prop:([\w\.\-]+)\s*>|<%@\s*((?:\s*[\w\.]+\s*=\s*\'.*?\'|\s*[\w\.]+\s*=\s*".*?")*)\s*%>|<%[%#~\/\\$=\\[](.*?)%>|<prop:([\w\.\-]+)((?:\s*[\w\.\-]+\s*=\s*\'.*?\'|\s*[\w\.\-]+\s*=\s*".*?"|\s*[\w\.\-]+\s*=\s*<%.*?%>)*)\s*\/>/msS'; /** * Different configurations of component property/event/attribute |