diff options
author | Andrey Andreev <narf@devilix.net> | 2014-07-06 18:58:21 +0200 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2014-07-06 18:58:21 +0200 |
commit | f7bdd80d72dfcc7a0c49cb1c82df88dc1f992b06 (patch) | |
tree | db1eef04da64631095e4fbea79126e96a0eeb203 /system | |
parent | 5286ef0f3ec6d298fa53bfbf8ecde474e5710f81 (diff) | |
parent | a28d9bc9c429c2133447d4f088e336a16f26f507 (diff) |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system')
-rw-r--r-- | system/database/drivers/pdo/pdo_result.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/drivers/pdo/pdo_result.php b/system/database/drivers/pdo/pdo_result.php index 1b8fbc9d4..3f3af2e19 100644 --- a/system/database/drivers/pdo/pdo_result.php +++ b/system/database/drivers/pdo/pdo_result.php @@ -93,7 +93,7 @@ class CI_DB_pdo_result extends CI_DB_result { { // Might trigger an E_WARNING due to not all subdrivers // supporting getColumnMeta() - $field_names[$i] = @$this->result_id->getColumnMeta(); + $field_names[$i] = @$this->result_id->getColumnMeta($i); $field_names[$i] = $field_names[$i]['name']; } |