From e310118bf48e6d3b45a733f2642a078e02eb1ff2 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 29 Sep 2020 08:08:44 +1000
Subject: [PATCH] Fixes for cleanly deleting and restoring users

---
 app/Listeners/User/DeletedUserActivity.php   | 2 +-
 app/Utils/Traits/Recurring/HasRecurrence.php | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Listeners/User/DeletedUserActivity.php b/app/Listeners/User/DeletedUserActivity.php
index 25e567fe1754..d5261f260350 100644
--- a/app/Listeners/User/DeletedUserActivity.php
+++ b/app/Listeners/User/DeletedUserActivity.php
@@ -48,7 +48,7 @@ class DeletedUserActivity implements ShouldQueue
 
         $fields = new \stdClass;
 
-        if (auth()->user()->id) {
+        if (auth()->check()) {
             $fields->user_id = auth()->user()->id;
         } else {
             $fields->user_id = $event->user->id;
diff --git a/app/Utils/Traits/Recurring/HasRecurrence.php b/app/Utils/Traits/Recurring/HasRecurrence.php
index e56bdcb00ab2..0a553c30ada1 100644
--- a/app/Utils/Traits/Recurring/HasRecurrence.php
+++ b/app/Utils/Traits/Recurring/HasRecurrence.php
@@ -53,8 +53,12 @@ trait HasRecurrence
      */
     public function setDayOfMonth($date, $day_of_month)
     {
+        info($date);
+
         $carbon_date = Carbon::parse($date);
         
+        info($carbon_date);
+
         $set_date = $carbon_date->copy()->setUnitNoOverflow('day', $day_of_month, 'month');
 
         //If the set date is less than the original date we need to add a month.