chore: quick return if sorting options are already present

ColdTrick · Jun 10, 2022 · 2995cf8 · 2995cf8
1 parent 5109739
commit 2995cf8
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/classes/ColdTrick/GroupTools/Views.php b/classes/ColdTrick/GroupTools/Views.php
@@ -19,6 +19,10 @@ class Views {
 	 * @return void
 	 */
 	public static function prepareGroupAll(\Elgg\Hook $hook) {
+		if (!empty(get_input('sort_by')) || !empty(get_input('sort'))) {
+			return;
+		}
+
 		$default_filter = elgg_get_plugin_setting('group_listing', 'group_tools');
 		if ($default_filter === 'yours' && !elgg_is_logged_in()) {
 			$default_filter = 'all';
@@ -30,49 +34,49 @@ public static function prepareGroupAll(\Elgg\Hook $hook) {
 		// support for 'old' tabs
 		switch ($filter) {
 			case 'newest':
-				set_input('sort_by', get_input('sort_by', [
+				set_input('sort_by', [
 					'property_type' => 'attribute',
 					'property' => 'time_created',
 					'direction' => 'desc',
-				]));
+				]);
 				set_input('filter', 'all');
 				$vars['filter_sorting_selected'] = 'sort:time_created:desc';
 				break;
 			case 'popular':
-				set_input('sort', get_input('sort', 'popular'));
+				set_input('sort', 'popular');
 				set_input('filter', 'all');
 				$vars['filter_sorting_selected'] = 'popular';
 				break;
 			case 'alpha':
-				set_input('sort_by', get_input('sort_by', [
+				set_input('sort_by', [
 					'property_type' => 'metadata',
 					'property' => 'name',
 					'direction' => 'asc',
-				]));
+				]);
 				set_input('filter', 'all');
 				$vars['filter_sorting_selected'] = 'sort:name:asc';
 				break;
 			default:
 				$sorting = elgg_get_plugin_setting("group_listing_{$filter}_sorting", 'group_tools', 'newest');
 				switch ($sorting) {
 					case 'alpha':
-						set_input('sort_by', get_input('sort_by', [
+						set_input('sort_by', [
 							'property_type' => 'metadata',
 							'property' => 'name',
 							'direction' => 'asc',
-						]));
+						]);
 						$vars['filter_sorting_selected'] = 'sort:name:asc';
 						break;
 					case 'newest':
-						set_input('sort_by', get_input('sort_by', [
+						set_input('sort_by', [
 							'property_type' => 'attribute',
 							'property' => 'time_created',
 							'direction' => 'desc',
-						]));
+						]);
 						$vars['filter_sorting_selected'] = 'sort:time_created:desc';
 						break;
 					case 'popular':
-						set_input('sort', get_input('sort', $sorting));
+						set_input('sort', $sorting);
 						$vars['filter_sorting_selected'] = 'popular';
 						break;
 					default: