From 6436e6bb51c4cf06a313848e91493a3f0e8b24b7 Mon Sep 17 00:00:00 2001 From: Jon Stovell Date: Tue, 11 Feb 2025 17:52:31 -0700 Subject: [PATCH] Fixes bugs when saving PM settings Signed-off-by: Jon Stovell --- Sources/Actions/PersonalMessage.php | 1 + Sources/Profile.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Sources/Actions/PersonalMessage.php b/Sources/Actions/PersonalMessage.php index 703ccef8e4..b5ab937801 100644 --- a/Sources/Actions/PersonalMessage.php +++ b/Sources/Actions/PersonalMessage.php @@ -769,6 +769,7 @@ public function settings(): void if (isset($_REQUEST['save'])) { User::$me->checkSession(); Profile::$member->save(); + Utils::redirectexit('action=pm;sa=settings'); } Profile::$member->setupContext(['pm_prefs']); diff --git a/Sources/Profile.php b/Sources/Profile.php index 42790338ee..6ee33b495f 100644 --- a/Sources/Profile.php +++ b/Sources/Profile.php @@ -1544,7 +1544,7 @@ public function save(): void // This allows variables to call activities when they save. Utils::$context['profile_execute_on_save'] = []; - if (User::$me->is_owner && in_array(Menu::$loaded['profile']->current_area, ['account', 'forumprofile', 'theme'])) { + if (User::$me->is_owner && in_array(Menu::$loaded['profile']->current_area ?? null, ['account', 'forumprofile', 'theme'])) { Utils::$context['profile_execute_on_save']['reload_user'] = [__CLASS__ . '::reloadUser', Profile::$member->id]; } @@ -1555,7 +1555,7 @@ public function save(): void $this->prepareToSaveCustomFields($_REQUEST['sa'] ?? null); // Give hooks some access to the save data. - IntegrationHook::call('integrate_profile_save', [&Profile::$member->new_data, &Profile::$member->save_errors, Profile::$member->id, Profile::$member->data, Menu::$loaded['profile']->current_area]); + IntegrationHook::call('integrate_profile_save', [&Profile::$member->new_data, &Profile::$member->save_errors, Profile::$member->id, Profile::$member->data, Menu::$loaded['profile']->current_area ?? null]); // There was a problem. Let them try again. if (!empty($this->save_errors)) {