diff options
| author | Eric Roberts <eric@cryode.com> | 2013-01-17 04:32:51 +0100 |
|---|---|---|
| committer | Eric Roberts <eric@cryode.com> | 2013-01-17 04:32:51 +0100 |
| commit | bd6faca03fc7934a0ad1cff8584bfb49d2a43d49 (patch) | |
| tree | 51e68684755b42a32e5a709479835be0fb891f9c /system/libraries/Unit_test.php | |
| parent | 7a4fb63a43392fc1cf5a5ead32ad81451c53dc67 (diff) | |
| parent | b26bb6ef76eb2f8327dafe085ae6bca14c22160b (diff) | |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into feature/output-cache-improvements
Diffstat (limited to 'system/libraries/Unit_test.php')
| -rw-r--r-- | system/libraries/Unit_test.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php index de8c9bb80..7a67c7276 100644 --- a/system/libraries/Unit_test.php +++ b/system/libraries/Unit_test.php @@ -356,12 +356,12 @@ class CI_Unit_test { */ protected function _parse_template() { - if ( ! is_null($this->_template_rows)) + if ($this->_template_rows !== NULL) { return; } - if (is_null($this->_template) OR ! preg_match('/\{rows\}(.*?)\{\/rows\}/si', $this->_template, $match)) + if ($this->_template === NULL OR ! preg_match('/\{rows\}(.*?)\{\/rows\}/si', $this->_template, $match)) { $this->_default_template(); return; |