Index: openacs-4/packages/chat/www/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/index-oracle.xql,v
diff -u -N
--- openacs-4/packages/chat/www/index-oracle.xql	14 Mar 2006 12:16:09 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<queryset>
-<rdbms><type>oracle</type><version>8.1.6</version></rdbms>
-
-<fullquery name="rooms_list">
-  <querytext>
-    select rm.room_id, rm.pretty_name, rm.description, rm.moderated_p, rm.active_p, rm.archive_p,
-    acs_permission.permission_p(room_id, :user_id, 'chat_room_admin') as admin_p,
-	acs_permission.permission_p(room_id, :user_id, 'chat_read') as user_p,           
-    (select site_node.url(site_nodes.node_id)
-                   from site_nodes
-                   where site_nodes.object_id = obj.context_id) as base_url
-    from chat_rooms rm, acs_objects obj
-    where obj.context_id = :package_id
-    and rm.room_id = obj.object_id
-    order by rm.pretty_name
-  </querytext>
-</fullquery>
-
-</queryset>
\ No newline at end of file
Index: openacs-4/packages/chat/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/index-postgresql.xql,v
diff -u -N
--- openacs-4/packages/chat/www/index-postgresql.xql	27 Apr 2015 07:12:55 -0000	1.6
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-<rdbms><type>postgresql</type><version>7.1</version></rdbms>
-
-<fullquery name="rooms_list">
-  <querytext>
-    select room_id, pretty_name, description, moderated_p, active_p, archive_p, 
-           acs_permission__permission_p(chats.room_id, :user_id, 'chat_room_admin') as admin_p, 
-           acs_permission__permission_p(chats.room_id, :user_id, 'chat_read') as user_p, 
-           (select site_node__url(site_nodes.node_id) from site_nodes
-            where site_nodes.object_id = chats.context_id) as base_url,
-           msg_count
-    from (select rm.room_id,     
-           rm.pretty_name, 
-           rm.description, 
-           rm.moderated_p, 
-           rm.active_p, 
-           rm.archive_p,
-           obj.context_id,
-           count(msg.msg_id) AS msg_count
-         from chat_rooms rm LEFT JOIN chat_msgs msg USING(room_id), acs_objects obj 
-         where rm.room_id = obj.object_id and obj.context_id = :package_id
-         GROUP BY rm.room_id, rm.pretty_name, rm.description, rm.moderated_p, rm.active_p, rm.archive_p, obj.context_id
-         order by rm.pretty_name
-    ) chats
-  </querytext>
-</fullquery>
-
-</queryset>
-
Index: openacs-4/packages/chat/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/index.tcl,v
diff -u -N -r1.18.2.1 -r1.18.2.2
--- openacs-4/packages/chat/www/index.tcl	15 Mar 2019 17:17:22 -0000	1.18.2.1
+++ openacs-4/packages/chat/www/index.tcl	15 Mar 2019 17:30:42 -0000	1.18.2.2
@@ -24,7 +24,25 @@
     lappend actions "#chat.Create_a_new_room#" room-edit "#chat.Create_a_new_room#"
 }
 
-db_multirow -extend { active_users last_activity room_url} rooms rooms_list {} {
+db_multirow -extend {
+    active_users last_activity room_url base_url
+} rooms rooms_list {
+    select rm.room_id,
+           rm.pretty_name,
+           rm.description,
+           rm.moderated_p,
+           rm.active_p,
+           rm.archive_p,
+           obj.context_id,
+           acs_permission.permission_p(rm.room_id, :user_id, 'chat_room_admin') as admin_p,
+           acs_permission.permission_p(rm.room_id, :user_id, 'chat_read') as user_p
+     from chat_rooms rm,
+          acs_objects obj
+    where rm.room_id = obj.object_id
+      and obj.context_id = :package_id
+    order by rm.pretty_name
+} {
+    set base_url [site_node::get_url_from_object_id -object_id $context_id]
     set room [::chat::Chat create new -volatile -chat_id $room_id]
     set active_users [$room nr_active_users]
     set last_activity [$room last_activity]