Don't append newlines to uploaded files

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 74e96f4aac78644d9dbf5f83d793d4e26fa3e992..f046ec441fc01fd71f9595d9d0d3753f006d74b3 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -643,8 +643,8 @@ function get_file($key, $decompress = false) {
                        } elseif ($start == "\xEF\xBB\xBF") { // UTF-8 BOM
                                $content = substr($content, 3);
                        }
+                       $return .= $content . "\n\n";
                }
-               $return .= $content . "\n\n";
        }
        //! support SQL files not ending with semicolon
        return $return;

diff --git a/changes.txt b/changes.txt
index fa3f788565b537846d71fbce13646728ed833d03..f026601350d4f13dd408af1e09041ebf26dd4e2c 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -8,6 +8,7 @@ Add button for dropping an index
 Display number of selected rows
 Disable underlining links
 Improve speed of CSV import
+Don't append newlines to uploaded files, bug since Adminer 3.7.0
 PostgreSQL: Fix handling of nextval() default values
 
 Adminer 3.7.1 (released 2013-06-29):