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/Unit_test.php | |
parent | 9d1407523ae585d45171b54123ba29c0ec831f79 (diff) | |
parent | 25d47aec0417e52af43985663ebc1f62931f13cd (diff) |
Merge https://github.com/EllisLab/CodeIgniter into test-encryption-class
Diffstat (limited to 'system/libraries/Unit_test.php')
-rw-r--r-- | system/libraries/Unit_test.php | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php index a87cf7e14..70ad8dc41 100644 --- a/system/libraries/Unit_test.php +++ b/system/libraries/Unit_test.php @@ -124,7 +124,7 @@ class CI_Unit_test { $this->results[] = $report; - return($this->report($this->result($report))); + return $this->report($this->result($report)); } // -------------------------------------------------------------------- @@ -289,15 +289,11 @@ class CI_Unit_test { */ protected function _backtrace() { - if (function_exists('debug_backtrace')) - { - $back = debug_backtrace(); - return array( - 'file' => (isset($back[1]['file']) ? $back[1]['file'] : ''), - 'line' => (isset($back[1]['line']) ? $back[1]['line'] : '') - ); - } - return array('file' => 'Unknown', 'line' => 'Unknown'); + $back = debug_backtrace(); + return array( + 'file' => (isset($back[1]['file']) ? $back[1]['file'] : ''), + 'line' => (isset($back[1]['line']) ? $back[1]['line'] : '') + ); } // -------------------------------------------------------------------- |