diff options
| author | James L Parry <jim_parry@bcit.ca> | 2014-12-03 10:39:09 +0100 |
|---|---|---|
| committer | James L Parry <jim_parry@bcit.ca> | 2014-12-03 10:39:09 +0100 |
| commit | 7eb492b77a30498c9d563032866fd0aaf494e44c (patch) | |
| tree | 477b8b8549816905715e096b14f3a50da4cf161e /system/database/DB_query_builder.php | |
| parent | d2485a3c8f62a6963cf5c49195e490ac67135b5d (diff) | |
| parent | df5299fd41c03ce2ad2e302e265aace36751bd31 (diff) | |
Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into userguide/database_utilities
Diffstat (limited to 'system/database/DB_query_builder.php')
| -rw-r--r-- | system/database/DB_query_builder.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index c7326cd35..1c0aed693 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -672,7 +672,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { // value appears not to have been set, assign the test to IS NULL $k .= ' IS NULL'; } - elseif (preg_match('/\s*(!?=|<>)\s*$/i', $k, $match, PREG_OFFSET_CAPTURE)) + elseif (preg_match('/\s*(!?=|<>|IS(?:\s+NOT)?)\s*$/i', $k, $match, PREG_OFFSET_CAPTURE)) { $k = substr($k, 0, $match[0][1]).($match[1][0] === '=' ? ' IS NULL' : ' IS NOT NULL'); } |