summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2009-02-11 19:55:24 +0100
committerDerek Jones <derek.jones@ellislab.com>2009-02-11 19:55:24 +0100
commita377bdd47e57ddde51e90641d961f00af4a71fa1 (patch)
tree1fa2eb7fc01ff8513c0874c5fc84b0f9af322fe3 /system
parent733310d86671ada1be601692bdd5bbd55dae5e7a (diff)
switched from gettype() to is_* for testing type in escape()
Diffstat (limited to 'system')
-rw-r--r--system/database/DB_driver.php21
1 files changed, 12 insertions, 9 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 42b6a7577..9385870e9 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -673,16 +673,19 @@ class CI_DB_driver {
* @return integer
*/
function escape($str)
- {
- switch (gettype($str))
+ {
+ if (is_string($str))
{
- case 'string' : $str = "'".$this->escape_str($str)."'";
- break;
- case 'boolean' : $str = ($str === FALSE) ? 0 : 1;
- break;
- default : $str = ($str === NULL) ? 'NULL' : $str;
- break;
- }
+ $str = "'".$this->escape_str($str)."'";
+ }
+ elseif (is_bool($str))
+ {
+ $str = ($str === FALSE) ? 0 : 1;
+ }
+ elseif (is_null($str))
+ {
+ $str = 'NULL';
+ }
return $str;
}