[phpMyAdmin Git] [phpmyadmin/phpmyadmin] aca2b8: Fix remaining issues due to #15823 changes