summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/odbc
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-01 14:01:58 +0100
committerAndrey Andreev <narf@bofh.bg>2012-03-01 14:01:58 +0100
commit3aaca2523de1a733c18473299cd3c72c9497869c (patch)
tree11d88239a0625e201c06f7bd78572862e6425a6c /system/database/drivers/odbc
parent005700340b444f3cfee8df98f5bf30b32c4a5085 (diff)
parent41e46a97a43b0d5080bb9ace1b9326266955ef21 (diff)
Merge upstream branch
Diffstat (limited to 'system/database/drivers/odbc')
-rw-r--r--system/database/drivers/odbc/odbc_result.php9
1 files changed, 4 insertions, 5 deletions
diff --git a/system/database/drivers/odbc/odbc_result.php b/system/database/drivers/odbc/odbc_result.php
index e7cbc7af5..db3576d35 100644
--- a/system/database/drivers/odbc/odbc_result.php
+++ b/system/database/drivers/odbc/odbc_result.php
@@ -78,19 +78,18 @@ class CI_DB_odbc_result extends CI_DB_result {
*/
public function list_fields()
{
+ $field_names = array();
$num_fields = $this->num_fields();
+
if ($num_fields > 0)
{
- $field_names = array();
for ($i = 1; $i <= $num_fields; $i++)
{
- $field_names[] = odbc_field_name($this->result_id, $i);
+ $field_names[] = odbc_field_name($this->result_id, $i);
}
-
- return $field_names;
}
- return array();
+ return $field_names;
}
// --------------------------------------------------------------------