Merge branch 'QA_4_5'

2015-10-21 16:41:11 -04:00 · 2015-10-21 16:41:11 -04:00 · 52de5b182e
commit 52de5b182e
parent f869dbccc6 b9101cbd74
2 changed files with 4 additions and 1 deletions
--- a/1
+++ b/1
@ -14,6 +14,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()
--- 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
                        );