diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-04-27 11:18:26 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-04-27 11:18:26 +0200 |
| commit | 1fcce9667fe8d1925a36549e22124411f5828230 (patch) | |
| tree | 56e5cb2c50831a50b7c79ea216645846ea59e8ab /system/database/drivers/mysqli | |
| parent | b8949fab60082e17f219fc89c6c8a85d3ff73f19 (diff) | |
| parent | ced2c9ab41450cb632c042730604111ec2a24e1f (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-mssql
Diffstat (limited to 'system/database/drivers/mysqli')
| -rw-r--r-- | system/database/drivers/mysqli/mysqli_driver.php | 4 | ||||
| -rw-r--r-- | system/database/drivers/mysqli/mysqli_result.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index a690682be..e2684e4f2 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -29,7 +29,7 @@ * MySQLi Database Adapter Class * * Note: _DB is an extender class that the app controller - * creates dynamically based on whether the active record + * creates dynamically based on whether the query builder * class is being used or not. * * @package CodeIgniter @@ -535,4 +535,4 @@ class CI_DB_mysqli_driver extends CI_DB { } /* End of file mysqli_driver.php */ -/* Location: ./system/database/drivers/mysqli/mysqli_driver.php */
\ No newline at end of file +/* Location: ./system/database/drivers/mysqli/mysqli_driver.php */ diff --git a/system/database/drivers/mysqli/mysqli_result.php b/system/database/drivers/mysqli/mysqli_result.php index cf0362217..9b4d494d4 100644 --- a/system/database/drivers/mysqli/mysqli_result.php +++ b/system/database/drivers/mysqli/mysqli_result.php @@ -125,11 +125,11 @@ class CI_DB_mysqli_result extends CI_DB_result { /** * Data Seek * - * Moves the internal pointer to the desired offset. We call + * Moves the internal pointer to the desired offset. We call * this internally before fetching results to make sure the * result set starts at zero * - * @return array + * @return bool */ protected function _data_seek($n = 0) { |