From 67b3543bdac52533b49f05a6382e332b5fa3cc8c Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Wed, 21 Oct 2015 23:16:10 +0300 Subject: [PATCH] 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 );