From 67b3543bdac52533b49f05a6382e332b5fa3cc8c Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Wed, 21 Oct 2015 23:16:10 +0300 Subject: [PATCH 1/2] Fix error message in sql-parser. Updated sql-parser to udan11/sql-parser@3d73f3877a7c471aa2754b3553bcfa3c73d31aa2 (v3.0.4). Signed-off-by: Dan Ungureanu --- libraries/sql-parser/src/Components/OptionsArray.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/sql-parser/src/Components/OptionsArray.php b/libraries/sql-parser/src/Components/OptionsArray.php index a68df8ec63..42f0762ab7 100644 --- a/libraries/sql-parser/src/Components/OptionsArray.php +++ b/libraries/sql-parser/src/Components/OptionsArray.php @@ -145,7 +145,9 @@ class OptionsArray extends Component $parser->error( sprintf( __('This option conflicts with "%1$s".'), - $ret->options[$lastOptionId] + is_array($ret->options[$lastOptionId]) + ? $ret->options[$lastOptionId]['name'] + : $ret->options[$lastOptionId] ), $token ); From b9101cbd7406b0951f7f5efbaac2558e57b14c1b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 21 Oct 2015 16:40:44 -0400 Subject: [PATCH 2/2] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 1bfc7b94b1..dba53b3725 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 4.5.2.0 (not yet released) - issue #11589 Incorrect parameter in mysqli_fetch_fields() - issue #11592 Missing headers in zipped export +- issue #11590 Parser: Array to string conversion 4.5.1.0 (not yet released) - issue Invalid argument supplied for foreach()