Search: Fixed last commented filter when using table prefixes

diff --git a/app/Search/SearchRunner.php b/app/Search/SearchRunner.php
index 265b9eecc022e6d395f19c94babe07840eb5087d..9716f8053be5c4d7e172bc50a83476bce4cb6424 100644 (file)
--- a/app/Search/SearchRunner.php
+++ b/app/Search/SearchRunner.php
@@ -463,7 +463,7 @@ class SearchRunner
         $morphClass = str_replace('\\', '\\\\', $model->getMorphClass());
         $commentQuery = DB::raw('(SELECT c1.entity_id, c1.entity_type, c1.created_at as last_commented FROM ' . $commentsTable . ' c1 LEFT JOIN ' . $commentsTable . ' c2 ON (c1.entity_id = c2.entity_id AND c1.entity_type = c2.entity_type AND c1.created_at < c2.created_at) WHERE c1.entity_type = \'' . $morphClass . '\' AND c2.created_at IS NULL) as comments');
 
         $morphClass = str_replace('\\', '\\\\', $model->getMorphClass());
         $commentQuery = DB::raw('(SELECT c1.entity_id, c1.entity_type, c1.created_at as last_commented FROM ' . $commentsTable . ' c1 LEFT JOIN ' . $commentsTable . ' c2 ON (c1.entity_id = c2.entity_id AND c1.entity_type = c2.entity_type AND c1.created_at < c2.created_at) WHERE c1.entity_type = \'' . $morphClass . '\' AND c2.created_at IS NULL) as comments');
 

-        $query->join($commentQuery, $model->getTable() . '.id', '=', 'comments.entity_id')
+        $query->join($commentQuery, $model->getTable() . '.id', '=', DB::raw('comments.entity_id'))

             ->orderBy('last_commented', $negated ? 'asc' : 'desc');
     }
 }
             ->orderBy('last_commented', $negated ? 'asc' : 'desc');
     }
 }