Changeset 2679

Timestamp:

05/20/2008 08:46:08 AM (6 months ago)

Author:

Shadowhand

Message:

Fixing a bug in from() that would prevent "FROM table1, table2" from working properly.

Files:

• trunk/system/libraries/Database.php (modified) (1 diff)

trunk/system/libraries/Database.php

@@ -307 +307 @@
         public function from($sql)
         {
-                foreach ((array) $sql as $val)
+                if (func_num_args() > 1)
+                {
+                        $sql = func_get_args();
+                }
+                elseif (is_string($sql))
+                {
+                        $sql = explode(',', $sql);
+                }
+                else
+                {
+                        $sql = (array) $sql;
+                }
+
+                foreach ($sql as $val)
                 {
                         if (($val = trim($val)) === '') continue;