diff options
| author | Joffrey Jaffeux <j.jaffeux@gmail.com> | 2012-06-07 20:00:59 +0200 |
|---|---|---|
| committer | Joffrey Jaffeux <j.jaffeux@gmail.com> | 2012-06-07 20:00:59 +0200 |
| commit | bb2da6fafaab754aee3e6745bf23db52e3aed57d (patch) | |
| tree | 85fd992a15d4ed1800218aedffa8a3aa09931ff2 /system/libraries/Profiler.php | |
| parent | 9d1407523ae585d45171b54123ba29c0ec831f79 (diff) | |
| parent | 25d47aec0417e52af43985663ebc1f62931f13cd (diff) | |
Merge https://github.com/EllisLab/CodeIgniter into test-encryption-class
Diffstat (limited to 'system/libraries/Profiler.php')
| -rw-r--r-- | system/libraries/Profiler.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index aaac0c518..d96088c14 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -402,7 +402,7 @@ class CI_Profiler { ."\n" .'<legend style="color:#5a0099;"> '.$this->CI->lang->line('profiler_memory_usage')." </legend>\n" .'<div style="color:#5a0099;font-weight:normal;padding:4px 0 4px 0;">' - .((function_exists('memory_get_usage') && ($usage = memory_get_usage()) !== '') ? number_format($usage).' bytes' : $this->CI->lang->line('profiler_no_memory')) + .(($usage = memory_get_usage()) != '' ? number_format($usage).' bytes' : $this->CI->lang->line('profiler_no_memory')) .'</div></fieldset>'; } |