[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 7f38ab: Refactoring lost during merge