issue 1204, added codeds for replace user defined language after widget proc

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10350 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-03-07 02:02:54 +00:00
parent af0f36f98a
commit 36a08228df

View file

@ -68,7 +68,6 @@
$attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars); $attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
// Wanted results // Wanted results
$widget_code = $this->execute($widget, $vars, true, false); $widget_code = $this->execute($widget, $vars, true, false);
$this->add('widget_code', $widget_code); $this->add('widget_code', $widget_code);
} }
@ -334,7 +333,11 @@
if(!$ignore_cache && (!$widget_cache || !$widget_sequence)) { if(!$ignore_cache && (!$widget_cache || !$widget_sequence)) {
$oWidget = $this->getWidgetObject($widget); $oWidget = $this->getWidgetObject($widget);
if(!$oWidget || !method_exists($oWidget, 'proc')) return; if(!$oWidget || !method_exists($oWidget, 'proc')) return;
return $oWidget->proc($args);
$widget_content = $oWidget->proc($args);
$oModuleController = &getController('module');
$oModuleController->replaceDefinedLangCode($widget_content);
return $widget_content;
} }
/** /**
@ -361,6 +364,8 @@
if(!$oWidget || !method_exists($oWidget,'proc')) return; if(!$oWidget || !method_exists($oWidget,'proc')) return;
$widget_content = $oWidget->proc($args); $widget_content = $oWidget->proc($args);
$oModuleController = &getController('module');
$oModuleController->replaceDefinedLangCode($widget_content);
FileHandler::writeFile($cache_file, $widget_content); FileHandler::writeFile($cache_file, $widget_content);
return $widget_content; return $widget_content;