Version 5.0.0 beta 9

applications/gallery/sources/Album/Comment.php

@@ -141,19 +141,6 @@ class Comment extends ContentComment implements Embeddable,
 		return parent::url( $action )->setQueryString( 'tab', 'comments' );
 	}
 
-	/**
-	 * Do stuff after creating (abstracted as comments and reviews need to do different things)
-	 *
-	 * @return	void
-	 */
-	public function postCreate(): void
-	{
-		parent::postCreate();
-
-		$this->item()->asNode()->setLastComment( $this );
-		$this->item()->asNode()->save();
-	}
-
 	/**
 	 * Reaction Type
 	 *

applications/gallery/sources/Album/Item.php

@@ -733,6 +733,9 @@ Filter
 
 		if ( $this->canEdit( $member ) )
 		{
+			/* Remove the original edit element, this doesn't use the correct form */
+			unset( $menu->elements['edit'] );
+
 			$editLink = new ContentMenuLink( url: $this->url()->setQueryString( array( 'do' => 'editAlbum' ) ), languageString: Member::loggedIn()->language()->addToStack( 'edit_album'), id: 'edit_album' );
 			$editLink->opensDialog( 'edit_album' );
 			$menu->add( $editLink )->moveToStart( $editLink );

applications/gallery/sources/Category/Category.php

@@ -624,6 +624,12 @@ class Category extends Model implements Permissions
 	 */
 	protected function _setLastComment( Comment $comment=NULL, Item $updatedItem=NULL ) : void
 	{
+		/* This can happen if we comment directly on an album. */
+		if( !( $updatedItem instanceof Image ) )
+		{
+			return;
+		}
+
 		$this->setLastImage( $updatedItem );
 	}