Merge pull request #11593 from udan11/QA_4_5

Fix error message in sql-parser.
2015-10-21 16:39:48 -04:00 · 2015-10-21 16:39:48 -04:00 · 16729d1b90
commit 16729d1b90
parent fe7a2c095b 67b3543bda
1 changed files with 3 additions and 1 deletions
--- 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
                        );