Merge branch 'bug/phpinfo-accessible-hotfix' into 2020.09-rc

# Conflicts:
#	src/Module/Admin/DBSync.php
#	src/Module/Admin/Logs/Settings.php
#	src/Module/Admin/Themes/Details.php
#	src/Module/Admin/Themes/Embed.php

diff --cc src/Module/Admin/Addons/Index.php
Simple merge

diff --cc src/Module/Admin/Blocklist/Contact.php
Simple merge

diff --cc src/Module/Admin/Blocklist/Server.php
Simple merge

diff --cc src/Module/Admin/Item/Delete.php
Simple merge

diff --cc src/Module/Admin/Site.php
Simple merge

diff --cc src/Module/Admin/Themes/Index.php
Simple merge

diff --cc src/Module/Admin/Tos.php
Simple merge

diff --cc src/Module/Admin/Users.php
index 84571d8c9a6632d140b133b012e3a72fb39e632c,74fee7230acd3218c583625b4bac5aa5679fd441..f38c24d979d66781d4382230273dfe3df547ffab
--- 1/src/Module/Admin/Users.php
--- 2/src/Module/Admin/Users.php
+++ b/src/Module/Admin/Users.php
@@@ -101,15 -101,13 +101,13 @@@ class Users extends BaseAdmi
        {
                parent::content($parameters);
  
-               $a = DI::app();
+               $action = $parameters['action'] ?? '';
+               $uid = $parameters['uid'] ?? 0;
  
-               if ($a->argc > 3) {
-                       // @TODO: Replace with parameter from router
-                       $action = $a->argv[2];
-                       $uid = $a->argv[3];
+               if ($uid) {
                        $user = User::getById($uid, ['username', 'blocked']);
                        if (!DBA::isResult($user)) {
 -                              notice('User not found' . EOL);
 +                              notice(DI::l10n()->t('User not found'));
                                DI::baseUrl()->redirect('admin/users');
                                return ''; // NOTREACHED
                        }

diff --cc src/Module/BaseAdmin.php
Simple merge

diff --cc static/routes.config.php
Simple merge