summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-13 11:20:11 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-13 11:20:11 +0100
commitd0b256f96d81d5577c619c3912db9a0e79a43b6c (patch)
tree26e0ee1b227c24cddfa7f7cbd4d9ae43a4139338
parent46f6dbc6a60e37ad1b88458f8cdfd3e1d1d94f5e (diff)
Revert fix for #81 - it actually breaks things
-rw-r--r--system/database/drivers/odbc/odbc_result.php4
-rw-r--r--user_guide_src/source/changelog.rst1
2 files changed, 2 insertions, 3 deletions
diff --git a/system/database/drivers/odbc/odbc_result.php b/system/database/drivers/odbc/odbc_result.php
index 115ba665c..06d99226e 100644
--- a/system/database/drivers/odbc/odbc_result.php
+++ b/system/database/drivers/odbc/odbc_result.php
@@ -185,7 +185,7 @@ class CI_DB_odbc_result extends CI_DB_result {
$rs_obj = new stdClass();
foreach ($rs as $k => $v)
{
- $field_name = odbc_field_name($odbc_result, $k);
+ $field_name = odbc_field_name($odbc_result, $k+1);
$rs_obj->$field_name = $v;
}
@@ -212,7 +212,7 @@ class CI_DB_odbc_result extends CI_DB_result {
$rs_assoc = array();
foreach ($rs as $k => $v)
{
- $field_name = odbc_field_name($odbc_result, $k);
+ $field_name = odbc_field_name($odbc_result, $k+1);
$rs_assoc[$field_name] = $v;
}
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 1a38f5249..79d26ba5b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -105,7 +105,6 @@ Bug fixes for 3.0
- Fixed a hosting edge case where an empty $_SERVER['HTTPS'] variable would evaluate to 'on'
- Fixed a bug (#154) - ``CI_Session::sess_update()`` caused the session to be destroyed on pages where multiple AJAX requests were executed at once.
- Fixed a possible bug in ``CI_Input::is_ajax_request()`` where some clients might not send the X-Requested-With HTTP header value exactly as 'XmlHttpRequest'.
-- Fixed a bug (#81) - ODBC result sets used to skip the first row.
Version 2.1.0
=============