Skip to content

Commit 74b7253

Browse files
committed
Merge branch 'QA_5_2'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2 parents 3abe8ed + 42f0b8f commit 74b7253

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

ChangeLog

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@ phpMyAdmin - ChangeLog
5454
- issue #18471 Fix SQL statement not being displayed correctly on RTL languages
5555
- issue Fix state times not getting summed in the profiling table
5656
- issue Fix a case where a fatal error message was not displayed
57-
- issue Fix profiling chart not loading when profiling is activated
57+
- issue #17420 Fix profiling chart not loading when profiling is activated
5858
- issue #18159 Fix error when changing the number of chart columns in the monitor page
59+
- issue #18403 Fix Uncaught SyntaxError: JSON.parse on makegrid conditions
5960

6061
5.2.1 (2023-02-07)
6162
- issue #17522 Fix case where the routes cache file is invalid

js/src/makegrid.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1278,7 +1278,11 @@ const makeGrid = function (t, enableResize = undefined, enableReorder = undefine
12781278
}
12791279

12801280
fullWhereClause.push(whereClause);
1281-
var conditionArray = JSON.parse(($tr.find('.condition_array').val() as string));
1281+
var conditionArrayContent: string | undefined = $tr.find('.condition_array').val() as string;
1282+
if (typeof conditionArrayContent === 'undefined') {
1283+
conditionArrayContent = '{}';
1284+
}
1285+
var conditionArray = JSON.parse(conditionArrayContent);
12821286

12831287
/**
12841288
* multi edit variables, for current row

0 commit comments

Comments
 (0)