fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-02 01:52:10 +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

8
classes/display/HTMLDisplayHandler.php
View file

@ -76,7 +76,7 @@ class HTMLDisplayHandler
{
if(__DEBUG__ == 3)
{
$start = getMicroTime();
$start = microtime(true);
}
Context::set('content', $output, false);
@ -132,7 +132,7 @@ class HTMLDisplayHandler
if(__DEBUG__ == 3)
{
$GLOBALS['__layout_compile_elapsed__'] = getMicroTime() - $start;
$GLOBALS['__layout_compile_elapsed__'] = microtime(true) - $start;
}
if(stripos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE && (Context::get('_use_ssl') == 'optional' || Context::get('_use_ssl') == 'always'))
@ -158,7 +158,7 @@ class HTMLDisplayHandler
if(__DEBUG__ == 3)
{
$start = getMicroTime();
$start = microtime(true);
}
// move <style ..></style> in body to the header
@ -208,7 +208,7 @@ class HTMLDisplayHandler
if(__DEBUG__ == 3)
{
$GLOBALS['__trans_content_elapsed__'] = getMicroTime() - $start;
$GLOBALS['__trans_content_elapsed__'] = microtime(true) - $start;
}
// Remove unnecessary information