summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Kriete <pascal.kriete@ellislab.com>2009-08-24 18:42:52 +0200
committerPascal Kriete <pascal.kriete@ellislab.com>2009-08-24 18:42:52 +0200
commit69b1fcc0b26c181b24aed8c347db94563328a83e (patch)
tree146bada87f56cca974fa6152385b61e2d0e7bba8
parent5a8a455f19aa7fc57262cc740d45ebc531e34446 (diff)
updating xml_from_result to check for list_fields instead of field_names
-rw-r--r--system/database/DB_utility.php2
-rw-r--r--user_guide/changelog.html1
2 files changed, 2 insertions, 1 deletions
diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php
index 4ba69adbd..33c68faea 100644
--- a/system/database/DB_utility.php
+++ b/system/database/DB_utility.php
@@ -217,7 +217,7 @@ class CI_DB_utility extends CI_DB_forge {
*/
function xml_from_result($query, $params = array())
{
- 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 9044e3224..17cc003d9 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -110,6 +110,7 @@ SVN Revision: </p>
<li>Fixed a bug in the Calendar library where the shortname was output for "May".</li>
<li>Fixed a bug with ORIG_PATH_INFO that was allowing URIs of just a slash through.</li>
<li>Fixed a fatal error in the Oracle and ODBC drivers (#6752)</li>
+ <li>Fixed a bug where xml_from_result() was checking for a nonexistent method.</li>
<li>Fixed a bug where Database Forge's add_column and modify_column were not looping through when sent multiple fields.</li>
<li>Fixed a bug where the File Helper was using '/' instead of the DIRECTORY_SEPARATOR constant.</li>
<li>Fixed a bug to prevent PHP errors when attempting to use sendmail on servers that have manually disabled the PHP popen() function.</li>