[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 4e5b08: Fix errors introduced by wrongly merging