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

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

Browse Source
This commit is contained in:
Weblate 2016-03-24 07:50:20 +01:00
commit 3c398261b7
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
======================
4.6.1 (not yet released)
- issue #12120 PMA_Util not found in insert_edit.lib.php
4.6.0.0 (2016-03-22)
+ issue #11456 Disabled storage engines

3
libraries/insert_edit.lib.php
View File

@ -2316,7 +2316,8 @@ function PMA_getCurrentValueForDifferentTypes($possibly_uploaded_val, $key,
if (false !== $possibly_uploaded_val) {
$current_value = $possibly_uploaded_val;
} else if (! empty($multi_edit_funcs[$key])) {
$current_value = "'" . PMA_Util::sqlAddSlashes($current_value) . "'";
$current_value = "'" . PMA\libraries\Util::sqlAddSlashes($current_value)
. "'";
} else {
// c o l u m n v a l u e i n t h e f o r m
if (isset($multi_edit_columns_type[$key])) {