diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-01-21 21:27:09 +0000 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-01-21 21:27:09 +0000 |
| commit | e58a9c509b0a864aee583dd14a018a773dbc63e4 (patch) | |
| tree | 916532fa2abed9b0344c874ef8e70bb92e3fa16f /kohana/libraries/drivers/Database/Mysqli.php | |
| parent | a0456a9a47d35aa8a3776d6b5fea0e68706855d8 (diff) | |
Update Kohana to r3918
Diffstat (limited to 'kohana/libraries/drivers/Database/Mysqli.php')
| -rw-r--r-- | kohana/libraries/drivers/Database/Mysqli.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/kohana/libraries/drivers/Database/Mysqli.php b/kohana/libraries/drivers/Database/Mysqli.php index 206d42f2..795c576b 100644 --- a/kohana/libraries/drivers/Database/Mysqli.php +++ b/kohana/libraries/drivers/Database/Mysqli.php @@ -114,15 +114,18 @@ class Database_Mysqli_Driver extends Database_Mysql_Driver { public function field_data($table) { - $query = $this->link->query('SHOW COLUMNS FROM '.$this->escape_table($table)); + $columns = array(); + $query = $this->link->query('SHOW COLUMNS FROM '.$this->escape_table($table)); - $table = array(); - while ($row = $query->fetch_object()) + if (is_object($query)) { - $table[] = $row; + while ($row = $query->fetch_object()) + { + $columns[] = $row; + } } - return $table; + return $columns; } } // End Database_Mysqli_Driver Class |