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

Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2

Browse Source
This commit is contained in:
Weblate 2014-09-05 18:39:05 +02:00
commit e1664a35e2
2 changed files with 7 additions and 2 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.9.0 (not yet released)
- bug ajax.js responseHandler: cannot read property of null
- bug sql.js: str is undefined
4.2.8.0 (2014-08-31)
- bug #4516 Odd export behavior

8
js/sql.js
View File

@ -18,7 +18,9 @@ var prevScrollX = 0, fixedTop;
*/
function PMA_urldecode(str)
{
return decodeURIComponent(str.replace(/\+/g, '%20'));
if (typeof str !== 'undefined') {
return decodeURIComponent(str.replace(/\+/g, '%20'));
}
}
/**
@ -29,7 +31,9 @@ function PMA_urldecode(str)
*/
function PMA_urlencode(str)
{
return encodeURIComponent(str).replace(/\%20/g, '+');
if (typeof str !== 'undefined') {
return encodeURIComponent(str).replace(/\%20/g, '+');
}
}
/**