Skip to content

Commit

Permalink
Bug Undefined index submit_type
Browse files Browse the repository at this point in the history
Signed-off-by: Marc Delisle <marc@infomarc.info>
  • Loading branch information
lem9 committed Jan 27, 2015
1 parent f20406e commit b25e20f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions ChangeLog
Expand Up @@ -7,6 +7,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
Expand Down
8 changes: 5 additions & 3 deletions libraries/insert_edit.lib.php
Expand Up @@ -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();
Expand All @@ -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);
}

Expand Down

0 comments on commit b25e20f

Please sign in to comment.