abijah/pmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge in the hosted_migration_20130215 branch to the v0.3_work branch

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@1030 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
Abijah
2013-12-05 01:24:21 +00:00
parent 20284046c3
commit 98d9849914
15 changed files with 65 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
site/plugins/debug_kit/controllers/components/toolbar.php
View File

@@ -163,7 +163,7 @@ class ToolbarComponent extends Object {
trigger_error(sprintf(__('Could not load DebugToolbar panel %s', true), $panel), E_USER_WARNING);
continue;
}
$panelObj =& new $className();
$panelObj = new $className();
if (is_subclass_of($panelObj, 'DebugPanel') || is_subclass_of($panelObj, 'debugpanel')) {
$this->panels[$panel] =& $panelObj;
}
@@ -456,7 +456,7 @@ class LogPanel extends DebugPanel {
* @return array
*/
function _parseFile($filename) {
$file =& new File($filename);
$file = new File($filename);
$contents = $file->read();
$timePattern = '/(\d{4}-\d{2}\-\d{2}\s\d{1,2}\:\d{1,2}\:\d{1,2})/';
$chunks = preg_split($timePattern, $contents, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);

4
site/plugins/debug_kit/views/elements/timer_panel.ctp
View File

@@ -30,14 +30,14 @@ $timers = DebugKitDebugger::getTimers();
?>
<h2><?php __('Timers'); ?></h2>
<p class="request-time">
<?php $totalTime = sprintf(__('%s (seconds)', true), $number->precision(DebugKitDebugger::requestTime(), 6)); ?>
<?php $totalTime = sprintf(__('%.6s (seconds)', true), DebugKitDebugger::requestTime()); ?>
<?php echo $toolbar->message(__('Total Request Time:', true), $totalTime)?>
</p>
<?php foreach ($timers as $timerName => $timeInfo):
$rows[] = array(
$timeInfo['message'],
$number->precision($timeInfo['time'], 6)
sprintf(__('%.6s', true), $timeInfo['time'])
);
$headers = array(__('Message', true), __('time in seconds', true));
endforeach;