2 files changed, 9 insertions, 1 deletions

diff --git a/system/drivers/DB_sqlite.php b/system/drivers/DB_sqlite.php
index b2c31a8ba..71d2561dc 100644
--- a/system/drivers/DB_sqlite.php
+++ b/system/drivers/DB_sqlite.php
@@ -489,7 +489,14 @@ class CI_DB_sqlite_result extends CI_DB_result {
 	 */
 	function _fetch_object()
 	{
-		return sqlite_fetch_object($this->result_id);
+		if (function_exists('sqlite_fetch_object'))
+		{
+			return sqlite_fetch_object($this->result_id);
+		}
+		else
+		{
+			return $this->_fetch_assoc();
+		}
 	}
 
 }
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index d2a33dda3..ef344ffc9 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -79,6 +79,7 @@ Change Log
 <li>Updated the URI Protocol code to allow more options so that URLs will work more reliably in different environments.</li>

 <li>Updated the <dfn>form_open()</dfn> helper to allow the GET method to be used.</li>

 <li>Updated the MySQLi <dfn>execute()</dfn> function with some code to help prevent lost connection errors.</li>

+<li>Updated the SQLite Driver to check for object support before attmpting to return results as objects.  If unsupported it returns an array.</li>

 <li>Updated the Models loader function to allow multiple loads of the same model.</li>

 <li>Updated the MS SQL driver so that single quotes are escaped.</li>

 <li>Removed a strtolower() call that was changing URL segments to lower case.</li>