From af8385dc878523a5aa648423b6f33c4f936de95b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 13 Jul 2016 12:12:10 +0200
Subject: [PATCH 1/2] Fix tests for transformations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 .../plugin/transformations/TransformationPluginsTest.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/classes/plugin/transformations/TransformationPluginsTest.php b/test/classes/plugin/transformations/TransformationPluginsTest.php
index 60b995b952..1bb620bf2e 100644
--- a/test/classes/plugin/transformations/TransformationPluginsTest.php
+++ b/test/classes/plugin/transformations/TransformationPluginsTest.php
@@ -779,7 +779,7 @@ class TransformationPluginsTest extends PMATestCase
                 ),
                 '<a href="transformation_wrapper.phpPMA_wrapper_link" '
                 . 'rel="noopener noreferrer" target="_blank"><img src="transformation_wrapper.php'
-                . 'PMA_wrapper_link&amp;resize=jpeg&amp;newWidth=./image/&amp;'
+                . 'PMA_wrapper_link&amp;resize=jpeg&amp;newWidth=0&amp;'
                 . 'newHeight=200" alt="[PMA_JPEG_Inline]" border="0" /></a>'
             ),
             array(
@@ -801,7 +801,7 @@ class TransformationPluginsTest extends PMATestCase
                 '<a href="transformation_wrapper.phpPMA_wrapper_link"'
                 . ' rel="noopener noreferrer" target="_blank"><img src="transformation_wrapper.php'
                 . 'PMA_wrapper_link&amp;'
-                . 'resize=jpeg&amp;newWidth=./image/&amp;newHeight=200" '
+                . 'resize=jpeg&amp;newWidth=0&amp;newHeight=200" '
                 . 'alt="[PMA_PNG_Inline]" border="0" /></a>'
             ),
             array(

From 205694982bf5f9a9d2bda80255fef22166dbd4a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 13 Jul 2016 12:12:26 +0200
Subject: [PATCH 2/2] Fix exporting multiline comments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/plugins/export/ExportSql.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/plugins/export/ExportSql.php b/libraries/plugins/export/ExportSql.php
index 769334a766..644e618077 100644
--- a/libraries/plugins/export/ExportSql.php
+++ b/libraries/plugins/export/ExportSql.php
@@ -599,9 +599,11 @@ class ExportSql extends ExportPlugin
                 return '--' . $GLOBALS['crlf'];
             } else {
                 $lines = preg_split("/\\r\\n|\\r|\\n/", $text);
+                $result = array();
                 foreach ($lines as $line) {
-                    return '-- ' . $line . $GLOBALS['crlf'];
+                    $result[] = '-- ' . $line . $GLOBALS['crlf'];
                 }
+                return implode('', $result);
             }
         } else {
             return '';