diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-06-12 13:45:45 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-06-12 13:45:45 +0200 |
| commit | b30a7c0d53c5dae5dab2311f777d67f639a5cee4 (patch) | |
| tree | d518bc938a5d8458a55277d9adaa7d8fdcc9f1d3 /system/libraries/Unit_test.php | |
| parent | 3902e383b41c6c0ef77b65e95d451cb2ea3d85db (diff) | |
| parent | 4e9538fe19b09c0dc588542cfb7f793348b83bf7 (diff) | |
Merge upstream
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'] : '') + ); } // -------------------------------------------------------------------- |