diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-20 13:49:56 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-20 13:49:56 +0100 |
| commit | 87230286b2948cf580e21f426824a974210d7595 (patch) | |
| tree | 3f0098f4f8b65ff61d60a333351d847387670596 /system/database/drivers/odbc/odbc_result.php | |
| parent | 5e18e891a14400a96f9b4af36925457b79b62005 (diff) | |
| parent | 6ea625e7f31b65838f1829408d37ac26009c79bc (diff) | |
Merge upstream branch
Diffstat (limited to 'system/database/drivers/odbc/odbc_result.php')
| -rw-r--r-- | system/database/drivers/odbc/odbc_result.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/system/database/drivers/odbc/odbc_result.php b/system/database/drivers/odbc/odbc_result.php index 219d16fa3..04a7463a4 100644 --- a/system/database/drivers/odbc/odbc_result.php +++ b/system/database/drivers/odbc/odbc_result.php @@ -2,7 +2,7 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE * @@ -144,7 +144,7 @@ class CI_DB_odbc_result extends CI_DB_result { * this internally before fetching results to make sure the * result set starts at zero * - * @return array + * @return bool */ protected function _data_seek($n = 0) { @@ -184,6 +184,8 @@ class CI_DB_odbc_result extends CI_DB_result { : $this->_odbc_fetch_object($this->result_id); } + // -------------------------------------------------------------------- + /** * Result - object * @@ -192,7 +194,7 @@ class CI_DB_odbc_result extends CI_DB_result { * * @return object */ - private function _odbc_fetch_object(& $odbc_result) + protected function _odbc_fetch_object(& $odbc_result) { $rs = array(); if ( ! odbc_fetch_into($odbc_result, $rs)) @@ -210,6 +212,7 @@ class CI_DB_odbc_result extends CI_DB_result { return $rs_obj; } + // -------------------------------------------------------------------- /** * Result - array @@ -219,7 +222,7 @@ class CI_DB_odbc_result extends CI_DB_result { * * @return array */ - private function _odbc_fetch_array(& $odbc_result) + protected function _odbc_fetch_array(& $odbc_result) { $rs = array(); if ( ! odbc_fetch_into($odbc_result, $rs)) |