|
@@ -346,7 +346,7 @@ discard block |
|
|
block discarded – undo |
|
346
|
346
|
* |
|
347
|
347
|
* @return string|null the full file path |
|
348
|
348
|
*/ |
|
349
|
|
- protected static function getDefaultFilePathForView($file){ |
|
|
349
|
+ protected static function getDefaultFilePathForView($file) { |
|
350
|
350
|
$searchDir = array(APPS_VIEWS_PATH, CORE_VIEWS_PATH); |
|
351
|
351
|
$fullFilePath = null; |
|
352
|
352
|
foreach ($searchDir as $dir) { |
|
@@ -465,7 +465,7 @@ discard block |
|
|
block discarded – undo |
|
465
|
465
|
// Parse out the elapsed time and memory usage, |
|
466
|
466
|
// then swap the pseudo-variables with the data |
|
467
|
467
|
$elapsedTime = $benchmark->elapsedTime('APP_EXECUTION_START', 'APP_EXECUTION_END'); |
|
468
|
|
- $memoryUsage = round($benchmark->memoryUsage('APP_EXECUTION_START', 'APP_EXECUTION_END') / 1024 / 1024, 6) . 'MB'; |
|
|
468
|
+ $memoryUsage = round($benchmark->memoryUsage('APP_EXECUTION_START', 'APP_EXECUTION_END') / 1024 / 1024, 6) . 'MB'; |
|
469
|
469
|
return str_replace(array('{elapsed_time}', '{memory_usage}'), array($elapsedTime, $memoryUsage), $content); |
|
470
|
470
|
} |
|
471
|
471
|
|
Please login to merge, or discard this patch.