Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 379dd368c926e15df691450bfeeed08fcb60d673 https://github.com/phpmyadmin/phpmyadmin/commit/379dd368c926e15df691450bfeee... Author: William Desportes williamdes@wdes.fr Date: 2020-02-23 (Sun, 02 February 2020) +01:00

Changed paths: M libraries/classes/Config/FormDisplay.php

Log Message: ----------- Fix #15986 - fatal error: Uncaught TypeError: array_flip() expects parameter 1 to be array, null given

Signed-off-by: William Desportes williamdes@wdes.fr

Commit: ce2dd25202febaeb09f9952aef53f8956979e67b https://github.com/phpmyadmin/phpmyadmin/commit/ce2dd25202febaeb09f9952aef53... Author: CommanderRoot CommanderRoot@users.noreply.github.com Date: 2020-02-23 (Sun, 02 February 2020) +01:00

Changed paths: M libraries/classes/Util.php

Log Message: ----------- Fix typo in Util.php

Signed-off-by: Tobias Speicher rootcommander@gmail.com

Commit: 36115c984124a9bdd55411fabea7762815f1414a https://github.com/phpmyadmin/phpmyadmin/commit/36115c984124a9bdd55411fabea7... Author: William Desportes williamdes@wdes.fr Date: 2020-02-23 (Sun, 02 February 2020) +01:00

Changed paths: M ChangeLog

Log Message: ----------- Add ChangeLog entry for #15986

Signed-off-by: William Desportes williamdes@wdes.fr

Commit: 01df1001e98408680d3276f5d278db464dfa1b2a https://github.com/phpmyadmin/phpmyadmin/commit/01df1001e98408680d3276f5d278... Author: William Desportes williamdes@wdes.fr Date: 2020-02-23 (Sun, 02 February 2020) +01:00

Changed paths: M ChangeLog M libraries/classes/Config/FormDisplay.php

Log Message: ----------- Merge branch 'QA_5_0'

Signed-off-by: William Desportes williamdes@wdes.fr