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/Javascript.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/Javascript.php')
| -rw-r--r-- | system/libraries/Javascript.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php index 542a0ecde..7f1d85511 100644 --- a/system/libraries/Javascript.php +++ b/system/libraries/Javascript.php @@ -737,7 +737,7 @@ class CI_Javascript { { // JSON data can optionally be passed to this function // either as a database result object or an array, or a user supplied array - if ( ! is_null($result)) + if ($result !== NULL) { if (is_object($result)) { @@ -823,7 +823,7 @@ class CI_Javascript { */ protected function _prep_args($result, $is_key = FALSE) { - if (is_null($result)) + if ($result === NULL) { return 'null'; } |