Clean up null/typehinted int handling

pkp · May 11, 2024 · f29ce26 · f29ce26
1 parent 24b1062
commit f29ce26
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/classes/user/Repository.php b/classes/user/Repository.php
@@ -135,7 +135,7 @@ public function delete(User $user)
      *
      * @return bool
      */
-    public function canCurrentUserGossip($userId)
+    public function canCurrentUserGossip(int $userId)
     {
         $request = Application::get()->getRequest();
         $context = $request->getContext();

diff --git a/controllers/grid/settings/user/form/UserDetailsForm.php b/controllers/grid/settings/user/form/UserDetailsForm.php
@@ -17,11 +17,11 @@
 namespace PKP\controllers\grid\settings\user\form;
 
 use APP\author\Author;
-use Illuminate\Support\Facades\Auth;
 use APP\core\Application;
 use APP\facades\Repo;
 use APP\notification\NotificationManager;
 use APP\template\TemplateManager;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Str;
 use PKP\core\Core;
@@ -327,11 +327,6 @@ public function execute(...$functionParams)
         $this->user->setBiography($this->getData('biography'), null); // Localized
         $this->user->setMustChangePassword($this->getData('mustChangePassword') ? 1 : 0);
 
-        // Users can never view/edit their own gossip fields
-        if (Repo::user()->canCurrentUserGossip($this->user->getId())) {
-            $this->user->setGossip($this->getData('gossip'));
-        }
-
         $site = $request->getSite();
         $availableLocales = $site->getSupportedLocales();
 
@@ -346,6 +341,11 @@ public function execute(...$functionParams)
         parent::execute(...$functionParams);
 
         if ($this->user->getId() != null) {
+            // Users can never view/edit their own gossip fields
+            if (Repo::user()->canCurrentUserGossip($this->user->getId())) {
+                $this->user->setGossip($this->getData('gossip'));
+            }
+
             if ($this->getData('password') !== '') {
                 $this->user->setPassword(Validation::encryptCredentials($this->user->getUsername(), $this->getData('password')));