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

Merge branch 'release/1.7.8' into develop

Browse source 
Conflicts:
	classes/context/Context.class.php
	config/config.inc.php
This commit is contained in:
bnu 2014-12-09 15:13:08 +09:00
commit 4506ea440e
50 changed files with 4086 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -411,7 +411,7 @@ class widgetController extends widget
// cache update and cache renewal of the file mtime
if(!$oCacheHandler->isSupport())
{
touch($cache_file);
touch($cache_file);
}
$oWidget = $this->getWidgetObject($widget);
@ -443,6 +443,7 @@ class widgetController extends widget
{
// Save for debug run-time widget
if(__DEBUG__==3) $start = getMicroTime();
$before = microtime(true);
// urldecode the value of args haejum
$object_vars = get_object_vars($args);
if(count($object_vars))
@ -641,6 +642,17 @@ class widgetController extends widget
$output = $widget_content_header . $widget_content_body . $widget_content_footer;
// Debug widget creation time information added to the results
if(__DEBUG__==3) $GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start;
$after = microtime(true);
$elapsed_time = $after - $before;
$slowlog = new stdClass;
$slowlog->caller = "widget.execute";
$slowlog->called = $widget;
$slowlog->called_extension = $widget;
writeSlowlog('widget', $elapsed_time, $slowlog);
// Return result
return $output;
}