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

8
classes/db/DB.class.php
View file

@ -382,7 +382,7 @@ class DB
{
$this->setError(0, 'success');
$this->query = $query;
$this->act_start = getMicroTime();
$this->act_start = microtime(true);
$this->elapsed_time = 0;
}
@ -396,7 +396,7 @@ class DB
{
return;
}
$this->act_finish = getMicroTime();
$this->act_finish = microtime(true);
$elapsed_time = $this->act_finish - $this->act_start;
$this->elapsed_time = $elapsed_time;
$GLOBALS['__db_elapsed_time__'] += $elapsed_time;
@ -1316,7 +1316,7 @@ class DB
function actDBClassStart()
{
$this->setError(0, 'success');
$this->act_dbclass_start = getMicroTime();
$this->act_dbclass_start = microtime(true);
$this->elapsed_dbclass_time = 0;
}
@ -1330,7 +1330,7 @@ class DB
{
return;
}
$this->act_dbclass_finish = getMicroTime();
$this->act_dbclass_finish = microtime(true);
$elapsed_dbclass_time = $this->act_dbclass_finish - $this->act_dbclass_start;
$this->elapsed_dbclass_time = $elapsed_dbclass_time;
$GLOBALS['__dbclass_elapsed_time__'] += $elapsed_dbclass_time;

2
classes/display/DisplayHandler.class.php
View file

@ -142,7 +142,7 @@ class DisplayHandler extends Handler
return;
}
$end = getMicroTime();
$end = microtime(true);
// Firebug console output
if(__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1)

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

4
classes/module/ModuleHandler.class.php
View file

@ -1052,7 +1052,7 @@ class ModuleHandler extends Handler
if(__DEBUG__ == 3)
{
$start_time = getMicroTime();
$start_time = microtime(true);
}
$parent_module = $module;
@ -1127,7 +1127,7 @@ class ModuleHandler extends Handler
if(__DEBUG__ == 3)
{
$GLOBALS['__elapsed_class_load__'] += getMicroTime() - $start_time;
$GLOBALS['__elapsed_class_load__'] += microtime(true) - $start_time;
}
// return the instance

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;

4
classes/xml/XmlParser.class.php
View file

@ -91,7 +91,7 @@ class XmlParser
// Save the compile starting time for debugging
if(__DEBUG__ == 3)
{
$start = getMicroTime();
$start = microtime(true);
}
$this->lang = Context::getLangType();
@ -143,7 +143,7 @@ class XmlParser
// Save compile starting time for debugging
if(__DEBUG__ == 3)
{
$GLOBALS['__xmlparse_elapsed__'] += getMicroTime() - $start;
$GLOBALS['__xmlparse_elapsed__'] += microtime(true) - $start;
}
return $output;