Merge remote-tracking branch 'engelsystem/feature-igel-rewrite'

# Conflicts:
#	includes/controller/angeltypes_controller.php
#	includes/pages/admin_groups.php
#	includes/pages/user_settings.php
#	includes/sys_page.php
#	src/Exceptions/Handler.php
#	src/Http/Request.php

1 files changed, 3 insertions, 6 deletions

diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php
index 5b91e413..d67af681 100644
--- a/includes/pages/admin_active.php
+++ b/includes/pages/admin_active.php
@@ -232,19 +232,17 @@ function admin_active()
     $shirt_statistics = [];
     foreach (array_keys($tshirt_sizes) as $size) {
         if (!empty($size)) {
-            $sc = DB::select(
+            $sc = DB::selectOne(
                 'SELECT count(*) FROM `User` WHERE `Size`=? AND `Gekommen`=1',
                 [$size]
             );
             $sc = array_shift($sc);
-            $sc = array_shift($sc);
 
-            $gc = DB::select(
+            $gc = DB::selectOne(
                 'SELECT count(*) FROM `User` WHERE `Size`=? AND `Tshirt`=1',
                 [$size]
             );
             $gc = array_shift($gc);
-            $gc = array_shift($gc);
 
             $shirt_statistics[] = [
                 'size'   => $size,
@@ -254,8 +252,7 @@ function admin_active()
         }
     }
 
-    $uc = DB::select('SELECT count(*) FROM `User` WHERE `Tshirt`=1');
-    $uc = array_shift($uc);
+    $uc = DB::selectOne('SELECT count(*) FROM `User` WHERE `Tshirt`=1');
     $uc = array_shift($uc);
 
     $shirt_statistics[] = [