From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Tue, 8 Sep 2020 18:07:46 +0000 (-0400)
Subject: Merge branch 'bug/phpinfo-accessible-hotfix' into 2020.09-rc
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fb7f7435c080e15bdafbbcbb5a3dfd94ef8dd952;p=friendica.git

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
---

fb7f7435c080e15bdafbbcbb5a3dfd94ef8dd952
diff --cc src/Module/Admin/Users.php
index 84571d8c9a,74fee7230a..f38c24d979
--- a/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
  			}