Changeset 6342 for branches

Timestamp:

May 24, 2010, 10:44:55 PM (15 years ago)

Author:

nikrou

Message:

Fix bug 1695 : incorrect boolean to string conversion for SQLite and PostgreSQL database engines merge from trunk

Location:

branches/2.1/include/dblayer

Files:

• functions_pdo-sqlite.inc.php (modified) (1 diff)
• functions_pgsql.inc.php (modified) (1 diff)
• functions_sqlite.inc.php (modified) (1 diff)

branches/2.1/include/dblayer/functions_pdo-sqlite.inc.php

@@ -468 +468 @@
 function boolean_to_string($var)
 {
-  if (!empty($var) && ($var == 'true'))
-  {
-    return 'true';
+  if (is_bool($var))
+  {
+    return $var ? 'true' : 'false';
   }
   else
   {
-    return 'false';
+    return $var;
   }
 }

branches/2.1/include/dblayer/functions_pgsql.inc.php

@@ -511 +511 @@
 function boolean_to_string($var)
 {
-  if (!empty($var) && ($var == 't'))
-  {
-    return 'true';
+  if (is_bool($var))
+  {
+    return $var ? 'true' : 'false';
   }
   else
   {
-    return 'false';
+    return $var;
   }
 }

branches/2.1/include/dblayer/functions_sqlite.inc.php

@@ -480 +480 @@
 function boolean_to_string($var)
 {
-  if (!empty($var) && ($var == 'true'))
-  {
-    return 'true';
+  if (is_bool($var))
+  {
+    return $var ? 'true' : 'false';
   }
   else
   {
-    return 'false';
+    return $var;
   }
 }