diff options
author | xue <> | 2006-12-01 21:39:16 +0000 |
---|---|---|
committer | xue <> | 2006-12-01 21:39:16 +0000 |
commit | c0239466d7e7142a67f6233169377b10fd93e6ec (patch) | |
tree | f0d5359296a02a739c192f2b82b01553c2cc39fd /framework/Web/UI/TTemplateManager.php | |
parent | 5975e2c0f7164ae445242aba0db4793898dc16b6 (diff) |
merge from 3.0 branch till 1537.
Diffstat (limited to 'framework/Web/UI/TTemplateManager.php')
-rw-r--r-- | framework/Web/UI/TTemplateManager.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/framework/Web/UI/TTemplateManager.php b/framework/Web/UI/TTemplateManager.php index 950f2c70..332ed7ab 100644 --- a/framework/Web/UI/TTemplateManager.php +++ b/framework/Web/UI/TTemplateManager.php @@ -177,7 +177,7 @@ class TTemplate extends TApplicationComponent implements ITemplate * '<%[%#~\\$=\\[](.*?)%>' - expressions
* '<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
@@ -484,6 +484,7 @@ class TTemplate extends TApplicationComponent implements ITemplate $component->$setter(Prado::localize($value[1]));
break;
default: // an error if reaching here
+ throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
break;
}
}
@@ -529,6 +530,7 @@ class TTemplate extends TApplicationComponent implements ITemplate $component->setSubProperty($name,Prado::localize($value[1]));
break;
default: // an error if reaching here
+ throw new TConfigurationException('template_tag_unexpected',$name,$value[1]);
break;
}
}
|