diff --git a/ChangeLog b/ChangeLog index d210910f4a..5f3dd85060 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog - issue #15767 Fixed can not copy user account since 5.0 - "error #1133" - issue #15772 Fixed error code 500 during pagination of the tables in a database - issue Fix php error "Trying to access array offset on value of type null" on column distinct values feature +- issue #15741 Fix fatal javascript error on clicking "Pick from Central Columns" 5.0.1 (2020-01-07) - issue #15719 Fixed error 500 when browsing a table when $cfg['LimitChars'] used a string and not an int value diff --git a/js/functions.js b/js/functions.js index d66a39a2db..86c0cb48b8 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3586,7 +3586,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 }); diff --git a/libraries/classes/Controllers/Database/CentralColumnsController.php b/libraries/classes/Controllers/Database/CentralColumnsController.php index 0c90d94612..38f8d0400e 100644 --- a/libraries/classes/Controllers/Database/CentralColumnsController.php +++ b/libraries/classes/Controllers/Database/CentralColumnsController.php @@ -79,7 +79,7 @@ class CentralColumnsController extends AbstractController return; } if (isset($_POST['getColumnList'])) { - $this->response->addJSON($this->getColumnList([ + $this->response->addJSON('message', $this->getColumnList([ 'cur_table' => $_POST['cur_table'] ?? null, ])); return;