Merge branch 'b4442_42' of git://github.com/Tithugues/phpmyadmin into…

… QA_4_2 Conflicts: ChangeLog
phpmyadmin · Jun 10, 2014 · 15b5051 · 15b5051
2 parents 5a6dad0 + 8295af5
commit 15b5051
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
 
 4.2.4.0 (not yet released)
 - bug #4449 Mediawiki export does not produce table header row; also fix related PHP warnings
+- bug #4442 New lines are added to query every time
 
 4.2.3.0 (2014-06-08)
 - bug #4423 Moving fields not working

diff --git a/js/functions.js b/js/functions.js
@@ -1380,7 +1380,7 @@ AJAX.registerOnload('functions.js', function () {
         }
 
         var $form = $(this).prev('form');
-        var sql_query  = $form.find("input[name='sql_query']").val();
+        var sql_query  = $form.find("input[name='sql_query']").val().trim();
         var $inner_sql = $(this).parent().prev().find('code.sql');
         var old_text   = $inner_sql.html();