diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2009-02-10 18:32:15 +0100 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2009-02-10 18:32:15 +0100 |
| commit | 4787413c06ec11bff1ba4b1c7a4fe667038595d0 (patch) | |
| tree | 7a070a64e3c45ca0da442e74dca4a4394bc3b477 | |
| parent | afa282f0ad2a7155766a69b605e27347d6c5f6fb (diff) | |
fixed check for a method named 'field_names' which doesn't exist to 'list_fields' which is the correct method.
http://codeigniter.com/bug_tracker/bug/5787/
| -rw-r--r-- | system/database/DB_utility.php | 2 | ||||
| -rw-r--r-- | user_guide/changelog.html | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php index 195e4c46a..6619e80e7 100644 --- a/system/database/DB_utility.php +++ b/system/database/DB_utility.php @@ -175,7 +175,7 @@ class CI_DB_utility extends CI_DB_forge { */ function csv_from_result($query, $delim = ",", $newline = "\n", $enclosure = '"') { - if ( ! is_object($query) OR ! method_exists($query, 'field_names')) + if ( ! is_object($query) OR ! method_exists($query, 'list_fields')) { show_error('You must submit a valid result object'); } diff --git a/user_guide/changelog.html b/user_guide/changelog.html index cb9a370bf..3d5e9b3ff 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -75,10 +75,6 @@ SVN Revision: </p> <li>Database <ul> <li>Added where_in to the list of expected arguments received by <kbd>delete()</kbd>.</li> - <li>Fixed a bug when doing 'random' on order_by() (#5706).</li> - <li>Fixed a bug where adding a primary key through Forge could fail (#5731).</li> - <li>Fixed a bug when using DB cache on multiple databases (#5737).</li> - <li>Fixed a bug where TRUNCATE was not considered a "write" query (#6619).</li> </ul> </li> <li>Helpers @@ -102,6 +98,15 @@ SVN Revision: </p> <h3>Bug fixes for 1.7.1</h3> <ul> + <li>Database + <ul> + <li>Fixed a bug when doing 'random' on order_by() (#5706).</li> + <li>Fixed a bug where adding a primary key through Forge could fail (#5731).</li> + <li>Fixed a bug when using DB cache on multiple databases (#5737).</li> + <li>Fixed a bug where TRUNCATE was not considered a "write" query (#6619).</li> + <li>Fixed a bug where csv_from_result() was checking for a nonexistent method.</li> + </ul> + </li> <li>Fixed assorted user guide typos or examples (#5998, #6093, #6259, #6339, #6432, #6521).</li> <li>Fixed a bug in the MySQLi driver when no port is specified</li> <li>Fixed a bug (#5702), in which the field label was not being fetched properly, when "matching" one field to another.</li> |