diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-06-28 13:08:40 +0200 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-06-28 13:08:40 +0200 |
commit | 89db8ee4c16c5cdd589e51f27fcd3fc23cf41aae (patch) | |
tree | 0a667b4e332fe5181bba4531d025740bc892821a /system/database/DB_query_builder.php | |
parent | cbd78d826b965ad6dfc953686594749cbdf21af3 (diff) | |
parent | d580999cead0aa37d705c2f32e02712a2d522deb (diff) |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into feature/db_subdrivers
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 4c43fe3c3..3982885e8 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -1218,7 +1218,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { * @param string the offset clause * @return object */ - public function get_where($table = '', $where = null, $limit = null, $offset = null) + public function get_where($table = '', $where = NULL, $limit = NULL, $offset = NULL) { if ($table !== '') { |