Guest create page: name field autofocus

[bookstack] / app / Auth / User.php

diff --git a/app/Auth/User.php b/app/Auth/User.php
index c060d5ec8e65ad724e2eff8e8dee8e901e931d9f..6e66bc808296c4c531568ac516c93412000a07c9 100644 (file)
--- a/app/Auth/User.php
+++ b/app/Auth/User.php
@@ -80,6 +80,11 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     protected ?Collection $permissions;
 
      */
     protected ?Collection $permissions;
 

+    /**
+     * This holds the user's avatar URL when loaded to prevent re-calculating within the same request.
+     */
+    protected string $avatarUrl = '';
+

     /**
      * This holds the default user when loaded.
      *
     /**
      * This holds the default user when loaded.
      *


@@ -233,12 +238,18 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
             return $default;
         }
 
             return $default;
         }
 

+        if (!empty($this->avatarUrl)) {
+            return $this->avatarUrl;
+        }
+

         try {
             $avatar = $this->avatar ? url($this->avatar->getThumb($size, $size, false)) : $default;
         } catch (Exception $err) {
             $avatar = $default;
         }
 
         try {
             $avatar = $this->avatar ? url($this->avatar->getThumb($size, $size, false)) : $default;
         } catch (Exception $err) {
             $avatar = $default;
         }
 

+        $this->avatarUrl = $avatar;
+

         return $avatar;
     }
 
         return $avatar;
     }