fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-29 15:22:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into fix/context-static-this

Browse source
This commit is contained in:
Kijin Sung 2016-01-09 15:18:11 +09:00
commit 840b2356f8
29 changed files with 435 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

4
classes/template/TemplateHandler.class.php
View file

@ -123,7 +123,7 @@ class TemplateHandler
// store the starting time for debug information
if(__DEBUG__ == 3)
{
$start = getMicroTime();
$start = microtime(true);
}
// initiation
@ -184,7 +184,7 @@ class TemplateHandler
// store the ending time for debug information
if(__DEBUG__ == 3)
{
$GLOBALS['__template_elapsed__'] += getMicroTime() - $start;
$GLOBALS['__template_elapsed__'] += microtime(true) - $start;
}
return $output;