Changeset 2016

Timestamp:

02/10/2008 12:23:51 AM (10 months ago)

Author:

Shadowhand

Message:

Cleaning up some small things in libraries and drivers. Also removed Form_Model and the media controller.

Location:

trunk/system

Files:

• controllers/media.php (deleted)
• libraries/Archive.php (modified) (2 diffs)
• libraries/drivers/Database/Mysql.php (modified) (1 diff)
• libraries/drivers/Database/Pdosqlite.php (modified) (1 diff)
• models (deleted)

trunk/system/libraries/Archive.php

@@ -60 +60 @@
 
                 // Set the name
-                ($name === NULL) and $name = $path;
+                empty($name) and $name = $path;
 
                 if (file_exists($path) AND is_dir($path))
@@ -71 +71 @@
                         $this->paths[] = array($path, $name);
 
-                        if ($recursive == TRUE)
+                        if ($recursive === TRUE)
                         {
                                 $dir = opendir($path);

trunk/system/libraries/drivers/Database/Mysql.php

@@ -289 +289 @@
         public function field_data($table)
         {
-                $query  = mysql_query('SHOW COLUMNS FROM '.$this->escape_table($table), $this->link);
-
-                $table  = array();
-                while ($row = mysql_fetch_object($query))
-                {
-                        $table[] = $row;
-                }
-
-                return $table;
+                $columns = array();
+
+                if ($query = mysql_query('SHOW COLUMNS FROM '.$this->escape_table($table), $this->link))
+                {
+                        if (mysql_num_rows($query) > 0)
+                        {
+                                while ($row = mysql_fetch_object($query))
+                                {
+                                        $columns[] = $row;
+                                }
+                        }
+                }
+
+                return $columns;
         }
 

trunk/system/libraries/drivers/Database/Pdosqlite.php

@@ -661 +661 @@
         }
         // End Interface
+
 } // End PdoSqlite_Result Class