Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7
This commit is contained in:
commit
f90fdf2fc2
@ -1853,7 +1853,7 @@ function getJSConfirmCommonParam (elem, params) {
|
||||
} else {
|
||||
params = '';
|
||||
}
|
||||
params += 'is_js_confirmed=1&ajax_request=true&fk_checks' + ($elem.find('#fk_checks').is(':checked') ? 1 : 0);
|
||||
params += 'is_js_confirmed=1&ajax_request=true&fk_checks=' + ($elem.find('#fk_checks').is(':checked') ? 1 : 0);
|
||||
return params;
|
||||
}
|
||||
|
||||
|
||||
@ -297,6 +297,7 @@ class TableStructureController extends TableController
|
||||
//after refactoring sql.php
|
||||
$db = $this->db;
|
||||
$table = $this->table;
|
||||
$sql_query = $GLOBALS['sql_query'];
|
||||
$cfg = $GLOBALS['cfg'];
|
||||
$is_superuser = $GLOBALS['dbi']->isSuperuser();
|
||||
$pmaThemeImage = $GLOBALS['pmaThemeImage'];
|
||||
|
||||
Loading…
Reference in New Issue
Block a user