summaryrefslogtreecommitdiff
path: root/kohana/libraries/drivers/Database/Mysqli.php
diff options
context:
space:
mode:
Diffstat (limited to 'kohana/libraries/drivers/Database/Mysqli.php')
-rw-r--r--kohana/libraries/drivers/Database/Mysqli.php13
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