diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-07-23 09:29:29 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-07-23 09:29:29 -0700 |
| commit | ac23b9be185d98e3b672dc4c9051dba1ec9d10fc (patch) | |
| tree | 73b50afb60202930d7bed2ef982eef0be0106fe0 /system/libraries | |
| parent | fa0c17ab5be2724b7fa850f2077afe7e69d6ef4d (diff) | |
| parent | 7f1a7ead589ce85e029ff0eb7f7e88bd04b8c8cb (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'system/libraries')
| -rw-r--r-- | system/libraries/ORM.php | 4 | ||||
| -rw-r--r-- | system/libraries/drivers/Database.php | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/system/libraries/ORM.php b/system/libraries/ORM.php index c1048604..5196ba27 100644 --- a/system/libraries/ORM.php +++ b/system/libraries/ORM.php @@ -1295,7 +1295,9 @@ class ORM_Core { $value = (float) $value; break; case 'boolean': - $value = (bool) $value; + if ($value === "t") $value = true; // For PgSQL + else if ($value === "f") $value = false; // For PgSQL + else $value = (bool) $value; break; case 'string': $value = (string) $value; diff --git a/system/libraries/drivers/Database.php b/system/libraries/drivers/Database.php index 807469f6..27f6ea8e 100644 --- a/system/libraries/drivers/Database.php +++ b/system/libraries/drivers/Database.php @@ -120,7 +120,7 @@ abstract class Database_Driver { $key .= ' ='; } - $value = ($value == TRUE) ? ' 1' : ' 0'; + $value = ($value == TRUE) ? ' TRUE' : ' FALSE'; } else { @@ -310,7 +310,7 @@ abstract class Database_Driver { $value = '\''.$this->escape_str($value).'\''; break; case 'boolean': - $value = (int) $value; + $value = ($value == TRUE) ? 'TRUE' : 'FALSE'; break; case 'double': // Convert to non-locale aware float to prevent possible commas |