Index: openacs-4/packages/forums-portlet/www/forums-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/forums-portlet-oracle.xql,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/forums-portlet/www/forums-portlet-oracle.xql	7 Aug 2017 23:48:12 -0000	1.5
+++ openacs-4/packages/forums-portlet/www/forums-portlet-oracle.xql	22 May 2018 14:32:10 -0000	1.6
@@ -3,26 +3,6 @@
 <queryset>
     <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-    <fullquery name="select_forums">
-        <querytext>
-	    select forums_forums.package_id,
-            acs_object.name(apm_package.parent_id(forums_forums.package_id)) as parent_name,
-            (select site_node.url(site_nodes.node_id)
-            from site_nodes
-            where site_nodes.object_id = forums_forums.package_id) as url,
-            forums_forums.forum_id,
-            forums_forums.name,
-	    $unread_or_new_query
-            from forums_forums_enabled forums_forums,
-            acs_objects
-            where acs_objects.object_id = forums_forums.forum_id and 
-            forums_forums.package_id in ([join $list_of_package_ids ,])
-            $private_data_restriction
-             order by parent_name,
-             forums_forums.name
-        </querytext>
-    </fullquery>
-
     <partialquery name="restrict_by_private_data_priv">
         <querytext>
             and exists (
Index: openacs-4/packages/forums-portlet/www/forums-portlet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/forums-portlet-postgresql.xql,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/forums-portlet/www/forums-portlet-postgresql.xql	7 Aug 2017 23:48:12 -0000	1.6
+++ openacs-4/packages/forums-portlet/www/forums-portlet-postgresql.xql	22 May 2018 14:32:10 -0000	1.7
@@ -3,26 +3,6 @@
 <queryset>
     <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-    <fullquery name="select_forums">
-        <querytext>
-	    select forums_forums.package_id,
-            acs_object__name(apm_package__parent_id(forums_forums.package_id)) as parent_name,
-            (select site_node__url(site_nodes.node_id)
-            from site_nodes
-            where site_nodes.object_id = forums_forums.package_id) as url,
-            forums_forums.forum_id,
-            forums_forums.name,
-						$unread_or_new_query
-            from forums_forums_enabled forums_forums,
-            acs_objects
-            where acs_objects.object_id = forums_forums.forum_id and 
-            forums_forums.package_id in ([join $list_of_package_ids ,])
-            $private_data_restriction
-             order by parent_name,
-             forums_forums.name
-        </querytext>
-    </fullquery>
-
     <partialquery name="restrict_by_private_data_priv">
       <querytext>
 	    and acs_permission__permission_p(forums_forums.package_id, :user_id, 'read_private_data')
Index: openacs-4/packages/forums-portlet/www/forums-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/forums-portlet.tcl,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/forums-portlet/www/forums-portlet.tcl	7 Aug 2017 23:48:12 -0000	1.18
+++ openacs-4/packages/forums-portlet/www/forums-portlet.tcl	22 May 2018 14:32:10 -0000	1.19
@@ -18,14 +18,12 @@
 
 set shaded_p $config(shaded_p)
 set list_of_package_ids $config(package_id)
-set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0]
+set one_instance_p [expr {[llength $list_of_package_ids] == 1}]
 
 # get the parameter from forums-portlet to set the new-graphic correspondingly
 set package_id [apm_package_id_from_key [forums_portlet::my_package_key]]
 set default_new_period [parameter::get -package_id $package_id -parameter DefaultPeriodNewGraphic -default 2]
 
-set query select_forums
-
 if { [acs_privacy::privacy_control_enabled_p] } {
     set private_data_restriction [db_map dbqd.forums-portlet.www.forums-portlet.restrict_by_private_data_priv]
 } else {
@@ -47,7 +45,28 @@
     }
 }
 
-db_multirow forums $query {}
+db_multirow -extend { url } forums select_forums {
+    select
+        apm_packages.instance_name as parent_name,
+        forums_forums.package_id,
+        forums_forums.forum_id,
+        forums_forums.name,
+        $unread_or_new_query
+    from
+        forums_forums_enabled forums_forums
+        INNER JOIN acs_objects ON (acs_objects.object_id=forums_forums.package_id)
+        INNER JOIN apm_packages ON (apm_packages.package_id=acs_objects.context_id)
+    where
+        forums_forums.package_id IN ([join $list_of_package_ids ,])
+        $private_data_restriction
+    order by
+        parent_name,
+        package_id,
+        forums_forums.name
+} {
+    set url [lindex [site_node::get_url_from_object_id -object_id $package_id] 0]
+}
+    
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/forums-portlet/www/forums-portlet.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/Attic/forums-portlet.xql,v
diff -u -N
--- openacs-4/packages/forums-portlet/www/forums-portlet.xql	13 Jan 2005 13:58:18 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-
-    <fullquery name="restrict_by_private_data_priv">
-        <querytext>
-            and exists (
-                select 1
-                from acs_object_party_privilege_map ppm
-                where ppm.object_id = forums_forums.package_id
-                  and ppm.party_id = :user_id
-                  and ppm.privilege = 'read_private_data'
-            )
-        </querytext>
-    </fullquery>
-</queryset>