Merge remote-tracking branch 'upstream/develop' into develop

4 files changed, 1 insertions, 13 deletions

diff --git a/system/database/drivers/sqlite3/sqlite3_driver.php b/system/database/drivers/sqlite3/sqlite3_driver.php
index 27d2bbfff..fdbe94939 100644
--- a/system/database/drivers/sqlite3/sqlite3_driver.php
+++ b/system/database/drivers/sqlite3/sqlite3_driver.php
@@ -358,6 +358,3 @@ class CI_DB_sqlite3_driver extends CI_DB {
 	}
 
 }
-
-/* End of file sqlite3_driver.php */
-/* Location: ./system/database/drivers/sqlite3/sqlite3_driver.php */
\ No newline at end of file
diff --git a/system/database/drivers/sqlite3/sqlite3_forge.php b/system/database/drivers/sqlite3/sqlite3_forge.php
index b1f3169c2..69f65b6f3 100644
--- a/system/database/drivers/sqlite3/sqlite3_forge.php
+++ b/system/database/drivers/sqlite3/sqlite3_forge.php
@@ -222,6 +222,3 @@ class CI_DB_sqlite3_forge extends CI_DB_forge {
 	}
 
 }
-
-/* End of file sqlite3_forge.php */
-/* Location: ./system/database/drivers/sqlite3/sqlite3_forge.php */
\ No newline at end of file
diff --git a/system/database/drivers/sqlite3/sqlite3_result.php b/system/database/drivers/sqlite3/sqlite3_result.php
index 179bcc895..387481b7f 100644
--- a/system/database/drivers/sqlite3/sqlite3_result.php
+++ b/system/database/drivers/sqlite3/sqlite3_result.php
@@ -98,7 +98,7 @@ class CI_DB_sqlite3_result extends CI_DB_result {
 		);
 
 		$retval = array();
-		for ($i = 0, $c = $this->num_fields(); $i < $this->num_fields(); $i++)
+		for ($i = 0, $c = $this->num_fields(); $i < $c; $i++)
 		{
 			$retval[$i]			= new stdClass();
 			$retval[$i]->name		= $this->result_id->columnName($i);
@@ -192,6 +192,3 @@ class CI_DB_sqlite3_result extends CI_DB_result {
 	}
 
 }
-
-/* End of file sqlite3_result.php */
-/* Location: ./system/database/drivers/sqlite3/sqlite3_result.php */
\ No newline at end of file
diff --git a/system/database/drivers/sqlite3/sqlite3_utility.php b/system/database/drivers/sqlite3/sqlite3_utility.php
index 3cd7faaa4..336f68754 100644
--- a/system/database/drivers/sqlite3/sqlite3_utility.php
+++ b/system/database/drivers/sqlite3/sqlite3_utility.php
@@ -59,6 +59,3 @@ class CI_DB_sqlite3_utility extends CI_DB_utility {
 	}
 
 }
-
-/* End of file sqlite3_utility.php */
-/* Location: ./system/database/drivers/sqlite3/sqlite3_utility.php */
\ No newline at end of file