No longer need to confirm at the PHP level
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin