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

Merge #15766 - Fix #15741 - Fatal javascript error on clicking "Pick from Central Columns"

Browse Source 
Pull-request: #15766
Fixes: #15741
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2020-01-11 16:05:48 +01:00
commit 30a0bfdc31
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db_central_columns.php
View File

@ -65,7 +65,7 @@ if (isset($_POST['populateColumns'])) {
exit;
}
if (isset($_POST['getColumnList'])) {
$response->addJSON($controller->getColumnList([
$response->addJSON('message', $controller->getColumnList([
'cur_table' => $_POST['cur_table'] ?? null,
]));
exit;

2
js/functions.js
View File

@ -3561,7 +3561,7 @@ AJAX.registerOnload('functions.js', function () {
url: href,
data: params,
success: function (data) {
centralColumnList[db + '_' + table] = JSON.parse(data.message);
centralColumnList[db + '_' + table] = data.message;
},
async:false
});