Changed user_link and some other user functions to use the user id

5 files changed, 9 insertions, 9 deletions

diff --git a/includes/view/ShiftEntry_view.php b/includes/view/ShiftEntry_view.php
index 7884e404..1d6ba3a3 100644
--- a/includes/view/ShiftEntry_view.php
+++ b/includes/view/ShiftEntry_view.php
@@ -22,7 +22,7 @@ function ShiftEntry_delete_view_admin($shiftEntry, $shift, $angeltype, $signoff_
             $angeltype['name']
         ), true),
         buttons([
-            button(user_link($signoff_user), glyph('remove') . __('cancel')),
+            button(user_link($signoff_user['UID']), glyph('remove') . __('cancel')),
             button(shift_entry_delete_link($shiftEntry, [
                 'continue' => 1
             ]), glyph('ok') . __('delete'), 'btn-danger')
@@ -51,7 +51,7 @@ function ShiftEntry_delete_view($shiftEntry, $shift, $angeltype, $signoff_user)
             $angeltype['name']
         ), true),
         buttons([
-            button(user_link($signoff_user), glyph('remove') . __('cancel')),
+            button(user_link($signoff_user['UID']), glyph('remove') . __('cancel')),
             button(shift_entry_delete_link($shiftEntry, [
                 'continue' => 1
             ]), glyph('ok') . __('delete'), 'btn-danger')
diff --git a/includes/view/Shifts_view.php b/includes/view/Shifts_view.php
index 0aa89f2e..92447efd 100644
--- a/includes/view/Shifts_view.php
+++ b/includes/view/Shifts_view.php
@@ -141,7 +141,7 @@ function Shift_view($shift, $shifttype, $room, $angeltypes_source, ShiftSignupSt
             $admin_rooms ? button(room_link($room), glyph('map-marker') . $room['Name']) : '',
         ];
     }
-    $buttons[] = button(user_link($user), '<span class="icon-icon_angel"></span> ' . __('My shifts'));
+    $buttons[] = button(user_link($user['UID']), '<span class="icon-icon_angel"></span> ' . __('My shifts'));
     $content[] = buttons($buttons);
 
     $content[] = Shift_view_header($shift, $room);
diff --git a/includes/view/UserDriverLicenses_view.php b/includes/view/UserDriverLicenses_view.php
index 317910b6..664a5d58 100644
--- a/includes/view/UserDriverLicenses_view.php
+++ b/includes/view/UserDriverLicenses_view.php
@@ -12,7 +12,7 @@ function UserDriverLicense_edit_view($user_source, $wants_to_drive, $user_driver
 {
     return page_with_title(sprintf(__('Edit %s driving license information'), User_Nick_render($user_source)), [
         buttons([
-            button(user_link($user_source), __('Back to profile'), 'back')
+            button(user_link($user_source['UID']), __('Back to profile'), 'back')
         ]),
         msg(),
         form([
diff --git a/includes/view/UserWorkLog_view.php b/includes/view/UserWorkLog_view.php
index e64f5412..1c2ffb40 100644
--- a/includes/view/UserWorkLog_view.php
+++ b/includes/view/UserWorkLog_view.php
@@ -15,7 +15,7 @@ function UserWorkLog_delete_view($user_source, $userWorkLog)
             User_Nick_render($user_source)
         ), true),
         buttons([
-            button(user_link($user_source), glyph('remove') . __('cancel')),
+            button(user_link($user_source['UID']), glyph('remove') . __('cancel')),
             button(user_worklog_delete_link($userWorkLog, [
                 'confirmed' => 1
             ]), glyph('ok') . __('delete'), 'btn-danger')
@@ -60,7 +60,7 @@ function UserWorkLog_edit_view($user_source, $userWorkLog)
 {
     return page_with_title(UserWorkLog_edit_title(), [
         buttons([
-            button(user_link($user_source), __('back'))
+            button(user_link($user_source['UID']), __('back'))
         ]),
         msg(),
         UserWorkLog_edit_form($user_source, $userWorkLog)
@@ -78,7 +78,7 @@ function UserWorkLog_add_view($user_source, $userWorkLog)
 {
     return page_with_title(UserWorkLog_add_title(), [
         buttons([
-            button(user_link($user_source), __('back'))
+            button(user_link($user_source['UID']), __('back'))
         ]),
         msg(),
         UserWorkLog_edit_form($user_source, $userWorkLog)
diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index 1b3c0daf..ccd5e5d2 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -153,7 +153,7 @@ function User_delete_view($user)
     return page_with_title(sprintf(__('Delete %s'), User_Nick_render($user)), [
         msg(),
         buttons([
-            button(user_edit_link($user), glyph('chevron-left') . __('back'))
+            button(user_edit_link($user['UID']), glyph('chevron-left') . __('back'))
         ]),
         error(
             __('Do you really want to delete the user including all his shifts and every other piece of his data?'),
@@ -177,7 +177,7 @@ function User_edit_vouchers_view($user)
     return page_with_title(sprintf(__('%s\'s vouchers'), User_Nick_render($user)), [
         msg(),
         buttons([
-            button(user_link($user), glyph('chevron-left') . __('back'))
+            button(user_link($user['UID']), glyph('chevron-left') . __('back'))
         ]),
         info(sprintf(
             __('Angel should receive at least  %d vouchers.'),