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

Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0

Browse Source
This commit is contained in:
Madhura Jayaratne 2013-09-14 16:31:53 +05:30
commit 9c7623089d
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -8,6 +8,8 @@ phpMyAdmin - ChangeLog
- bug #3929 Database-specific privileges are not copied when cloning user
- bug #3997 Error handling in case MySQL extension is missing
- bug #4089 Moving Columns will alter column definition
- bug #4091 Insert ignore option does not work
- bug #4090 Downloading BLOB downloads page template
4.0.6.0 (2013-09-05)
- bug #4036 Call to undefined function mb_detect_encoding (clarify the doc)

3
libraries/insert_edit.lib.php
View File

@ -1737,7 +1737,6 @@ function PMA_getParamsForUpdateOrInsert()
$is_insert = $_REQUEST['submit_type'] == 'insert'
|| $_REQUEST['submit_type'] == 'showinsert'
|| $_REQUEST['submit_type'] == 'insertignore';
$is_insertignore = $_REQUEST['submit_type'] == 'insertignore';
} else {
// new row => use indexes
$loop_array = array();
@ -1746,8 +1745,8 @@ function PMA_getParamsForUpdateOrInsert()
}
$using_key = false;
$is_insert = true;
$is_insertignore = false;
}
$is_insertignore = $_REQUEST['submit_type'] == 'insertignore';
return array($loop_array, $using_key, $is_insert, $is_insertignore);
}

2
tbl_get_field.php
View File

@ -9,6 +9,8 @@
/**
* Common functions.
*/
// we don't want the usual PMA_Response-generated HTML above the column's data
define('PMA_BYPASS_GET_INSTANCE', 1);
require_once 'libraries/common.inc.php';
require_once 'libraries/mime.lib.php';