diff --git a/ChangeLog b/ChangeLog index 7345abd8da..9de514e059 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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() 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 );