[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 4bde7f: Fix a merge issue reported by Scrutinizer