Two small (but important) fixes (#1525)

* Update dependencies * Fix User Model with name attribute * preserve comment * Fix migration Co-authored-by: ildyria <beviguier@gmail.com>
LycheeOrg · Sep 23, 2022 · c0a90b7 · c0a90b7
1 parent 5884d4a
commit c0a90b7
Show file tree

Hide file tree

Showing 5 changed files with 145 additions and 135 deletions.
diff --git a/app/Http/Livewire/Sidebar.php b/app/Http/Livewire/Sidebar.php
@@ -84,7 +84,7 @@ public function generateAlbumStructure()
 			['head' => Lang::get('ALBUM_PASSWORD'), 'value' => $_password],
 		];
 		if ($this->album->owner_id !== null) {
-			$share->content[] = ['head' => Lang::get('ALBUM_OWNER'), 'value' => $this->album->owner->name()];
+			$share->content[] = ['head' => Lang::get('ALBUM_OWNER'), 'value' => $this->album->owner->name];
 		}
 
 		$license = new \stdClass();

diff --git a/app/Models/BaseAlbumImpl.php b/app/Models/BaseAlbumImpl.php
@@ -275,7 +275,7 @@ public function toArray(): array
 	{
 		$result = parent::toArray();
 		if (Auth::check()) {
-			$result['owner_name'] = $this->owner->name();
+			$result['owner_name'] = $this->owner->name;
 		}
 
 		return $result;

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -135,11 +135,11 @@ public function username(): string
 	}
 
 	/**
-	 * Used by Larapass.
+	 * Used by Larapass since 2022-09-21.
 	 *
 	 * @return string
 	 */
-	public function name(): string
+	public function getNameAttribute(): string
 	{
 		// If strings starts by '$2y$', it is very likely that it's a blowfish hash.
 		return substr($this->username, 0, 4) === '$2y$' ? 'Admin' : $this->username;