gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
Michal Čihař 2014-06-10 09:14:07 +02:00
commit 15b5051928
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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

2
js/functions.js
View File

@ -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();