Merge remote-tracking branch 'origin/master'

phpmyadmin · Jan 28, 2015 · 0733b08 · 0733b08
2 parents 881e949 + dcf93b7
commit 0733b08
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
@@ -1738,7 +1738,7 @@ function PMA_getParamsForUpdateOrInsert()
             ? $_REQUEST['where_clause']
             : array($_REQUEST['where_clause']);
         $using_key  = true;
-        $is_insert  = isset($_REQUEST['submit_type']) 
+        $is_insert  = isset($_REQUEST['submit_type'])
                       && ($_REQUEST['submit_type'] == 'insert'
                       || $_REQUEST['submit_type'] == 'showinsert'
                       || $_REQUEST['submit_type'] == 'insertignore');