fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-16 01:39:58 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.5.2

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/widget/widget.controller.php
View file

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