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

Merge branch 'QA_4_3'

Browse Source
This commit is contained in:
Marc Delisle 2015-01-27 11:24:34 -05:00
commit 8b737e4cc2
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -31,6 +31,7 @@ phpMyAdmin - ChangeLog
- bug #4729 Display original field when using "Relational display column" option and display column is empty
- bug #4734 Default values for binary fields do not support binary values
- bug #4736 Changing display options breaks query highlighting
- bug Undefined index submit_type
4.3.8.0 (2015-01-24)
- bug Undefined constant PMA_DRIZZLE

8
libraries/insert_edit.lib.php
View File

@ -1738,9 +1738,10 @@ function PMA_getParamsForUpdateOrInsert()
? $_REQUEST['where_clause']
: array($_REQUEST['where_clause']);
$using_key = true;
$is_insert = $_REQUEST['submit_type'] == 'insert'
$is_insert = isset($_REQUEST['submit_type'])
&& ($_REQUEST['submit_type'] == 'insert'
|| $_REQUEST['submit_type'] == 'showinsert'
|| $_REQUEST['submit_type'] == 'insertignore';
|| $_REQUEST['submit_type'] == 'insertignore');
} else {
// new row => use indexes
$loop_array = array();
@ -1752,7 +1753,8 @@ function PMA_getParamsForUpdateOrInsert()
$using_key = false;
$is_insert = true;
}
$is_insertignore = $_REQUEST['submit_type'] == 'insertignore';
$is_insertignore = isset($_REQUEST['submit_type'])
&& $_REQUEST['submit_type'] == 'insertignore';
return array($loop_array, $using_key, $is_insert, $is_insertignore);
}