Merge upstream/master into 2.0.0-beta1

Author: Lennart

application/datamapper/csv.php

@@ -83,7 +83,7 @@ function csv_export($object, $filename, $fields = '', $include_header = TRUE)
 		if($include_header)
 		{
 			// Print out header line
-			$success = fputcsv($fp, $fields);
+			$success = fputcsv($fp, $fields, ',', '"', '');
 		}
 
 		if($success)
@@ -97,7 +97,7 @@ function csv_export($object, $filename, $fields = '', $include_header = TRUE)
 					$result[] = $o->{$f};
 				}
 				// output CSV-formatted line
-				$success = fputcsv($fp, $result);
+				$success = fputcsv($fp, $result, ',', '"', '');
 				if(!$success)
 				{
 					// stop on first failure.
@@ -163,7 +163,7 @@ function csv_import($object, $filename, $fields = '', $header_row = TRUE, $callb
 		}
 		$columns = NULL;
 
-		while(($data = fgetcsv($fp)) !== FALSE)
+		while(($data = fgetcsv($fp, 0, ',', '"', '')) !== FALSE)
 		{
 			// get column names
 			if(is_null($columns))

application/libraries/datamapper.php

@@ -237,7 +237,6 @@ function dmz_log_message($level, $message, array $context = array())
  * Nestedsets Extension:
  *
  */
-
 #[\AllowDynamicProperties]
 class DataMapper implements IteratorAggregate {