diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 4d40b9185..668ce11cf 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.8.9
+ - fixed #11235: wiki search
 
 7.8.8
  - fixed #11289: Gallery with pending version tag causes search engine indexer to puke.
diff --git a/lib/WebGUI/Asset/File/GalleryFile.pm b/lib/WebGUI/Asset/File/GalleryFile.pm
index c640dcf45..5d8748ce5 100644
--- a/lib/WebGUI/Asset/File/GalleryFile.pm
+++ b/lib/WebGUI/Asset/File/GalleryFile.pm
@@ -204,7 +204,7 @@ sub canEdit {
     my $album       = $self->getParent;
 
     return 1 if $userId eq $self->get("ownerUserId");
-    return $album->canEdit($userId);
+    return $album && $album->canEdit($userId);
 }
 
 #----------------------------------------------------------------------------
@@ -239,7 +239,7 @@ sub canView {
     my $userId      = shift || $self->session->user->userId;
 
     my $album       = $self->getParent;
-    return 0 unless $album->canView($userId);
+    return 0 unless $album && $album->canView($userId);
 
     if ($self->isFriendsOnly && $userId ne $self->get("ownerUserId") ) {
         my $owner       = WebGUI::User->new( $self->session, $self->get("ownerUserId") );
@@ -416,7 +416,14 @@ sub getParent {
         return $album;
     }
     # Only get the pending version if we're allowed to see this photo in its pending status
-    elsif ( $self->getGallery->canEdit || $self->get( 'ownerUserId' ) eq $self->session->user->userId ) {
+    my $gallery
+        = $self->getLineage( ['ancestors'], {
+            includeOnlyClasses  => [ 'WebGUI::Asset::Wobject::Gallery' ],
+            returnObjects       => 1,
+            statusToInclude     => [ 'pending', 'approved' ],
+            invertTree          => 1,
+        } )->[ 0 ];
+    if ( ($gallery && $gallery->canEdit) || $self->get( 'ownerUserId' ) eq $self->session->user->userId ) {
         my $album
             = $self->getLineage( ['ancestors'], {
                 includeOnlyClasses  => [ 'WebGUI::Asset::Wobject::GalleryAlbum' ],
@@ -426,6 +433,7 @@ sub getParent {
             } )->[ 0 ];
         return $album;
     }
+    return undef;
 }
 
 #----------------------------------------------------------------------------
diff --git a/t/Asset/File/GalleryFile/Photo/permissions.t b/t/Asset/File/GalleryFile/Photo/permissions.t
index 74774601a..ee4f58c3e 100644
--- a/t/Asset/File/GalleryFile/Photo/permissions.t
+++ b/t/Asset/File/GalleryFile/Photo/permissions.t
@@ -80,7 +80,8 @@ $session->stow->delete('assetRevision');
 $versionTag->leaveTag;
 
 $session->user({userId => $notFriend->userId});
-diag $album2->canEdit;
+note "If you get stuck here, then there is an infinite loop in getParent/getGallery";
+my $album2a = WebGUI::Asset->new($session, $photo2->getId);
 $session->user({userId => 1});
 
 $versionTag->commit;