rollback of r9995

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9997 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-12-30 02:04:56 +00:00
parent e7fc49cfc1
commit aec75bbdf1
2 changed files with 4 additions and 12 deletions

View file

@ -427,7 +427,7 @@ class TemplateHandler {
{
$attr = array();
if($m[5]) {
if(preg_match_all('@,(?: +)?(\w+)="([^"]+)"@', $m[6], $mm)) {
if(preg_match_all('@,(\w+)="([^"]+)"@', $m[6], $mm)) {
foreach($mm[1] as $idx=>$name) {
$attr[$name] = $mm[2][$idx];
}
@ -458,15 +458,7 @@ class TemplateHandler {
$plugin = $this->_replaceVar($m[5]);
if(strpos($plugin, '$__Context') === false) $plugin = "'{$plugin}'";
if($attr['type'])
{
$type = "'{$attr['type']}'";
return "<?php Context::loadJavascriptPlugin({$plugin}, {$type}); ?>";
}
else
{
return "<?php Context::loadJavascriptPlugin({$plugin}); ?>";
}
return "<?php Context::loadJavascriptPlugin({$plugin}); ?>";
// <load ...> or <unload ...> or <!--%import ...--> or <!--%unload ...-->
case 'import':