Index: openacs-4/packages/dotlrn-fs/dotlrn-fs.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/dotlrn-fs.info,v
diff -u -r1.26.2.7 -r1.26.2.8
--- openacs-4/packages/dotlrn-fs/dotlrn-fs.info	2 Jun 2006 00:41:55 -0000	1.26.2.7
+++ openacs-4/packages/dotlrn-fs/dotlrn-fs.info	5 Jun 2006 13:03:17 -0000	1.26.2.8
@@ -7,12 +7,12 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="2.2.0b1" url="http://openacs.org/repository/download/apm/dotlrn-fs-2.2.0b1.apm">
+    <version name="2.2.0b2" url="http://openacs.org/repository/download/apm/dotlrn-fs-2.2.0b2.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <release-date>2006-06-01</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
 
-        <provides url="dotlrn-fs" version="2.2.0b1"/>
+        <provides url="dotlrn-fs" version="2.2.0b2"/>
         <requires url="dotlrn" version="2.2.0a1"/>
         <requires url="file-storage" version="4.7d3"/>
         <requires url="fs-portlet" version="2.2.0a1"/>
@@ -28,6 +28,7 @@
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="WritePermissionForMembersP"  default="1"  description="Should the community members get the write permission to the folders?"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="WritePermissionForMembersOnPublicP"  default="0"  description="Should the community members get the write permission to the public folder?"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="InheritPermissionsForRootFolderP"  default="0"  description="Should the root folder inherit permissions from the community?"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="InheritPermissionsForPublicFolderP"  default="0"  description="Should the public folder inherit permissions from the community?"/>
         </parameters>
 
     </version>
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.90.2.5 -r1.90.2.6
--- openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl	18 May 2006 11:07:10 -0000	1.90.2.5
+++ openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl	5 Jun 2006 13:03:17 -0000	1.90.2.6
@@ -217,7 +217,10 @@
         # write to it but can't delete it by default, because the non-member portlet
         # expects it to exist.
 
-        permission::set_not_inherit -object_id $public_folder_id
+	if {![parameter::get -parameter "InheritPermissionForPublicFolderP" -default "0"]} {
+	    permission::set_not_inherit -object_id $public_folder_id
+	}
+
         permission::grant -party_id $admins -object_id $public_folder_id -privilege write
 
 	if {[parameter::get -parameter "WritePermissionForMembersOnPublicP" -default "0"]} {