Index: openacs-4/packages/forums/lib/search/search-chunk-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/search/search-chunk-postgresql.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/forums/lib/search/search-chunk-postgresql.xql	7 Aug 2017 23:48:11 -0000	1.2
+++ openacs-4/packages/forums/lib/search/search-chunk-postgresql.xql	15 Jun 2018 20:55:28 -0000	1.3
@@ -6,36 +6,18 @@
     <fullquery name="search_all_forums">
         <querytext>
             select forums_messages.*,
-                   person__name(forums_messages.user_id) as user_name,
                    to_char(forums_messages.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi,
                    100 as the_score
             from   forums_messages,
                    forums_forums
             where  forums_messages.forum_id = forums_forums.forum_id
-            and    forums_forums.package_id = :package_id
+            and    (:forum_id is null or forums_forums.forum_id = :forum_id)
+	    and    forums_forums.package_id = :package_id
             and    forums_messages.state = 'approved'
             and    forums_messages.subject || ' ' || forums_messages.content || ' ' || person__name(forums_messages.user_id)
                        ilike :search_pattern
             order  by forums_messages.posting_date desc
         </querytext>
     </fullquery>
 
-    <fullquery name="search_one_forum">
-        <querytext>
-            select forums_messages.*,
-                   person__name(forums_messages.user_id) as user_name,
-                   to_char(forums_messages.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi,
-                   100 as the_score
-            from   forums_messages,
-                   forums_forums
-            where  forums_forums.forum_id = :forum_id
-            and    forums_forums.package_id = :package_id
-            and    forums_messages.forum_id = forums_forums.forum_id
-            and    forums_messages.state = 'approved'
-            and    forums_messages.subject || ' ' || forums_messages.content || ' ' || person__name(forums_messages.user_id)
-                       ilike :search_pattern
-            order  by forums_messages.posting_date desc
-        </querytext>
-    </fullquery>
-
 </queryset>