diff options
| author | Chad Kieffer <ckieffer@gmail.com> | 2009-07-25 09:25:31 -0600 |
|---|---|---|
| committer | Chad Kieffer <ckieffer@gmail.com> | 2009-07-25 09:25:31 -0600 |
| commit | eca46d76a7832f771d377edb3939ea1aded2fac9 (patch) | |
| tree | d4f0323202c7eb6eab60ff6e14f9905b625e349b /system/libraries | |
| parent | 63511316be51f193d37c4f3b9dd3455a9ab60de8 (diff) | |
| parent | 50d6cc0150b930d79d3e8b90956ffa9655fcc9c5 (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 |