Index: openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl,v
diff -u -r1.77.2.2 -r1.77.2.3
--- openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl	8 Mar 2003 01:52:58 -0000	1.77.2.2
+++ openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl	14 Mar 2003 19:07:23 -0000	1.77.2.3
@@ -151,6 +151,15 @@
                 -pretty_name $folder \
                 -parent_id $folder_id
             ]
+
+            # We also don't want anyone other than the site-wide admin to be
+            # able to edit or delete these folders, because doing so breaks
+            # the standard portlets created to display them.  Admins can write
+            # to them, that's all.
+
+            permission::set_not_inherit -object_id $a_folder_id
+            permission::grant -party_id $members -object_id $a_folder_id -privilege read
+            permission::grant -party_id $admins -object_id $a_folder_id -privilege write
             
             site_node_object_map::new -object_id $a_folder_id -node_id $node_id
             
@@ -171,15 +180,6 @@
                     ]
                     portal::set_element_param $element_id folder_id $a_folder_id
                 }
-
-                # We also don't want anyone other than the site-wide admin to be
-                # able to edit or delete these folders, because doing so breaks
-                # the standard portlets created to display them.  Admins can write
-                # to them, that's all.
-
-                permission::set_not_inherit -object_id $a_folder_id
-                permission::grant -party_id $members -object_id $a_folder_id -privilege read
-                permission::grant -party_id $admins -object_id $a_folder_id -privilege write
   
             }
         }
@@ -557,12 +557,31 @@
 
             # the object is something not in the public folder
             copy_fs_object  \
-                -object_id [ns_set get $item object_id] \
+                -object_id $object_id \
                 -target_folder_id $folder_id \
                 -user_id $user_id
 
         }
 
+        # Jerk around the permissions for the default folders in the community ...
+
+        set root_community_type [dotlrn_community::get_toplevel_community_type_from_community_id \
+                                     $old_community_id
+        ]
+
+        set folder_list [parameter::get_from_package_key \
+                             -package_key [my_package_key] \
+                             -parameter "${root_community_type}_default_folders"
+        ]
+
+        foreach folder [string trim [split $folder_list ',']] {
+            if { [db_0or1row get_default_folder {}] } {
+                permission::set_not_inherit -object_id $item_id
+                permission::grant -party_id $members -object_id $item_id -privilege read
+                permission::grant -party_id $admins -object_id $item_id -privilege write
+            }
+        }
+
         #
         # portlet stuff
         #
Index: openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.xql,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.xql	31 Jul 2002 21:18:33 -0000	1.6
+++ openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.xql	14 Mar 2003 19:07:23 -0000	1.6.2.1
@@ -4,11 +4,20 @@
 
     <fullquery name="dotlrn_fs::get_community_shared_folder.select_community_shared_folder">
         <querytext>
-            select folder_id
-            from fs_folders
+            select item_id
+            from cr_items
             where parent_id = :root_folder_id
-            and key = 'public'
+            and name = 'public'
         </querytext>
     </fullquery>
 
+    <fullquery name="dotlrn_fs::clone.get_default_folder">
+        <querytext>
+            select item_id
+            from cr_items
+            where parent_id = :folder_id
+            and name = :folder
+        </querytext>
+    </fullquery>
+
 </queryset>