Fix error message.

phpmyadmin · Oct 21, 2015 · 3d73f38 · 3d73f38
1 parent f4b09dd
commit 3d73f38
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/Components/OptionsArray.php b/src/Components/OptionsArray.php
@@ -145,7 +145,9 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                         $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
                         );