Merge pull request #4166 from aanbar/optimize-csv-export

Optimize DB_utility csv_from_result() for speed

1 files changed, 3 insertions, 2 deletions

diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php
index 78398ea83..b51893e18 100644
--- a/system/database/DB_utility.php
+++ b/system/database/DB_utility.php
@@ -254,11 +254,12 @@ abstract class CI_DB_utility {
 		// Next blast through the result array and build out the rows
 		while ($row = $query->unbuffered_row('array'))
 		{
+			$line = array();
 			foreach ($row as $item)
 			{
-				$out .= $enclosure.str_replace($enclosure, $enclosure.$enclosure, $item).$enclosure.$delim;
+				$line[] = $enclosure.str_replace($enclosure, $enclosure.$enclosure, $item).$enclosure;
 			}
-			$out = substr($out, 0, -strlen($delim)).$newline;
+			$out .= implode($delim, $line).$newline;
 		}
 
 		return $out;