Index: openacs-4/packages/layout-managed-subsite/lib/add-applications.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/layout-managed-subsite/lib/add-applications.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/layout-managed-subsite/lib/add-applications.xql	30 Nov 2008 13:15:02 -0000	1.2
+++ openacs-4/packages/layout-managed-subsite/lib/add-applications.xql	3 Dec 2008 09:22:00 -0000	1.3
@@ -17,8 +17,9 @@
   <fullquery name="get_service_includelets">
     <querytext>
       select li.title, count(*)
-      from layout_includelets li, layout_elements le
-      where le.package_id = :subsite_id
+      from layout_includelets li, layout_elements le, layout_pages lp
+      where lp.pageset_id = :pageset_id
+        and le.page_id = lp.page_id
         and le.includelet_name = li.name
         and li.application = :package_key
       group by li.title
@@ -41,8 +42,10 @@
   <fullquery name="get_mounted_includelets">
     <querytext>
       select li.title, count(*)
-      from layout_includelets li, layout_elements le
-      where le.package_id = :package_id
+      from layout_includelets li, layout_elements le, layout_pages lp
+      where lp.pageset_id = :pageset_id
+        and le.package_id = :package_id
+        and le.page_id = lp.page_id
         and le.includelet_name = li.name
       group by li.title
       order by li.title