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

Merge branch 'develop' into refactor/minify-on-the-fly

Browse source
This commit is contained in:
Kijin Sung 2016-01-09 15:19:08 +09:00
commit 371f4a60b0
35 changed files with 2215 additions and 686 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -442,7 +442,7 @@ class widgetController extends widget
function execute($widget, $args, $javascript_mode = false, $escaped = true)
{
// Save for debug run-time widget
if(__DEBUG__==3) $start = getMicroTime();
if(__DEBUG__==3) $start = microtime(true);
$before = microtime(true);
// urldecode the value of args haejum
$object_vars = get_object_vars($args);
@ -641,7 +641,7 @@ 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;
if(__DEBUG__==3) $GLOBALS['__widget_excute_elapsed__'] += microtime(true) - $start;
$after = microtime(true);