From 7c6afc2bfe3263b91ecabf5530da57fe1162ea0b Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Wed, 10 Oct 2018 03:10:28 +0200
Subject: Removed `User($id)` function :tada:

---
 includes/view/Shifts_view.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'includes/view/Shifts_view.php')

diff --git a/includes/view/Shifts_view.php b/includes/view/Shifts_view.php
index bd13a390..2485ec67 100644
--- a/includes/view/Shifts_view.php
+++ b/includes/view/Shifts_view.php
@@ -1,5 +1,6 @@
 <?php
 
+use Engelsystem\Models\User\User;
 use Engelsystem\ShiftSignupState;
 
 /**
@@ -54,14 +55,14 @@ function Shift_editor_info_render($shift)
         $info[] = sprintf(
             glyph('plus') . __('created at %s by %s'),
             date('Y-m-d H:i', $shift['created_at_timestamp']),
-            User_Nick_render(User($shift['created_by_user_id']))
+            User_Nick_render(User::find($shift['created_by_user_id']))
         );
     }
     if (!empty($shift['edited_by_user_id'])) {
         $info[] = sprintf(
             glyph('pencil') . __('edited at %s by %s'),
             date('Y-m-d H:i', $shift['edited_at_timestamp']),
-            User_Nick_render(User($shift['edited_by_user_id']))
+            User_Nick_render(User::find($shift['edited_by_user_id']))
         );
     }
     return join('<br />', $info);
@@ -176,10 +177,8 @@ function Shift_view($shift, $shifttype, $room, $angeltypes_source, ShiftSignupSt
  */
 function Shift_view_render_needed_angeltype($needed_angeltype, $angeltypes, $shift, $user_shift_admin)
 {
-    global $user;
-
     $angeltype = $angeltypes[$needed_angeltype['TID']];
-    $angeltype_supporter = User_is_AngelType_supporter($user, $angeltype);
+    $angeltype_supporter = User_is_AngelType_supporter(auth()->user(), $angeltype);
 
     $needed_angels = '';
 
@@ -226,7 +225,7 @@ function Shift_view_render_needed_angeltype($needed_angeltype, $angeltypes, $shi
  */
 function Shift_view_render_shift_entry($shift_entry, $user_shift_admin, $angeltype_supporter)
 {
-    $entry = User_Nick_render(User($shift_entry['UID']));
+    $entry = User_Nick_render(User::find($shift_entry['UID']));
     if ($shift_entry['freeloaded']) {
         $entry = '<del>' . $entry . '</del>';
     }
-- 
cgit v1.2.3-54-g00ecf