From f604be8bd23fd9587500278c3ed199f351ce530b Mon Sep 17 00:00:00 2001 From: slimtim Date: Wed, 20 Nov 2013 21:44:48 -0500 Subject: [PATCH] When importing a SQL file convert carriage return (\r) line-endings to line feeds (\n) otherwise all queries in the file may not get executed on some platforms (e.g. Linux) --- libraries/plugins/import/ImportSql.class.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libraries/plugins/import/ImportSql.class.php b/libraries/plugins/import/ImportSql.class.php index 88628d3942..4ae9024a40 100644 --- a/libraries/plugins/import/ImportSql.class.php +++ b/libraries/plugins/import/ImportSql.class.php @@ -189,6 +189,11 @@ class ImportSql extends ImportPlugin continue; } } + + // Convert CR (but not CRLF) to LF otherwise all queries + // may not get executed on some platforms + $buffer = preg_replace("/\r($|[^\n])/", "\n$1", $buffer); + // Current length of our buffer $len = strlen($buffer);