From 0314ba19e38077b62a2884985b5dd4d50e8af0b0 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Sat, 30 Dec 2017 13:37:26 +0100
Subject: make got t-shirt always available

---
 includes/pages/admin_active.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php
index 6a9e96ce..c9f8679d 100644
--- a/includes/pages/admin_active.php
+++ b/includes/pages/admin_active.php
@@ -200,22 +200,26 @@ function admin_active()
                 . _('set active')
                 . '</a>';
         }
-        if ($usr['Aktiv'] == 1 && $usr['Tshirt'] == 0) {
+        if ($usr['Aktiv'] == 1) {
             $parametersRemove = [
                 'not_active' => $usr['UID'],
                 'search'     => $search,
             ];
+            if ($show_all_shifts) {
+                $parametersRemove['show_all_shifts'] = 1;
+            }
+            $actions[] = '<a href="' . page_link_to('admin_active', $parametersRemove) . '">'
+                . _('remove active')
+                . '</a>';
+        }
+        if ($usr['Tshirt'] == 0) {
             $parametersShirt = [
                 'tshirt' => $usr['UID'],
                 'search' => $search,
             ];
             if ($show_all_shifts) {
-                $parametersRemove['show_all_shifts'] = 1;
                 $parametersShirt['show_all_shifts'] = 1;
             }
-            $actions[] = '<a href="' . page_link_to('admin_active', $parametersRemove) . '">'
-                . _('remove active')
-                . '</a>';
             $actions[] = '<a href="' . page_link_to('admin_active', $parametersShirt) . '">'
                 . _('got t-shirt')
                 . '</a>';
-- 
cgit v1.2.3-54-g00ecf