From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Mon, 9 Nov 2020 01:09:10 +0000 (-0500)
Subject: Fix redirect/form paths in Module\Admin\Users\Index|Active
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ae00111f5b6c5e20d94f0662a9cb02823b5df3c3;p=friendica.git

Fix redirect/form paths in Module\Admin\Users\Index|Active
---

diff --git a/src/Module/Admin/Users/Active.php b/src/Module/Admin/Users/Active.php
index 1a12ad786c..4a7f056748 100644
--- a/src/Module/Admin/Users/Active.php
+++ b/src/Module/Admin/Users/Active.php
@@ -88,13 +88,13 @@ class Active extends BaseUsers
 					notice(DI::l10n()->t('You can\'t remove yourself'));
 				}
 
-				DI::baseUrl()->redirect('admin/users');
+				DI::baseUrl()->redirect('admin/users/active');
 				break;
 			case 'block':
 				self::checkFormSecurityTokenRedirectOnError('admin/users/active', 'admin_users_active', 't');
 				User::block($uid);
 				notice(DI::l10n()->t('User "%s" blocked', $user['username']));
-				DI::baseUrl()->redirect(DI::baseUrl()->get(true));
+				DI::baseUrl()->redirect('admin/users/active');
 				break;
 		}
 		$pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 100);
@@ -154,7 +154,7 @@ class Active extends BaseUsers
 
 			// values //
 			'$baseurl' => DI::baseUrl()->get(true),
-			'$query_string' => DI::baseUrl()->get(true),
+			'$query_string' => DI::args()->getQueryString(),
 
 			'$users' => $users,
 			'$count' => $count,
diff --git a/src/Module/Admin/Users/Index.php b/src/Module/Admin/Users/Index.php
index cc453a0731..8b8cf2f7fd 100644
--- a/src/Module/Admin/Users/Index.php
+++ b/src/Module/Admin/Users/Index.php
@@ -101,7 +101,7 @@ class Index extends BaseUsers
 				self::checkFormSecurityTokenRedirectOnError('admin/users', 'admin_users', 't');
 				User::block($uid);
 				notice(DI::l10n()->t('User "%s" blocked', $user['username']));
-				DI::baseUrl()->redirect(DI::baseUrl()->get(true));
+				DI::baseUrl()->redirect('admin/users');
 				break;
 			case 'unblock':
 				self::checkFormSecurityTokenRedirectOnError('admin/users', 'admin_users', 't');
@@ -171,7 +171,7 @@ class Index extends BaseUsers
 
 			// values //
 			'$baseurl' => DI::baseUrl()->get(true),
-			'$query_string' => DI::baseUrl()->get(true),
+			'$query_string' => DI::args()->getQueryString(),
 
 			'$users' => $users,
 			'$count' => $count,