Index: openacs-4/packages/file-storage/file-storage.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/file-storage.info,v
diff -u -r1.60.2.8 -r1.60.2.9
--- openacs-4/packages/file-storage/file-storage.info	23 Nov 2020 19:04:34 -0000	1.60.2.8
+++ openacs-4/packages/file-storage/file-storage.info	4 Dec 2020 10:56:19 -0000	1.60.2.9
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="5.10.0d9" url="http://openacs.org/repository/download/apm/file-storage-5.10.0d9.apm">
+    <version name="5.10.0d10" url="http://openacs.org/repository/download/apm/file-storage-5.10.0d10.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Collaborative document storage</summary>
         <release-date>2017-08-06</release-date>
@@ -17,7 +17,7 @@
         <maturity>2</maturity>
         <package_instance_name>#file-storage.file-storage#</package_instance_name>
 
-        <provides url="file-storage" version="5.10.0d9"/>
+        <provides url="file-storage" version="5.10.0d10"/>
         <requires url="acs-kernel" version="5.9.1"/>
         <requires url="acs-tcl" version="5.10.0d38"/>
         <requires url="acs-content-repository" version="5.9.1"/>
@@ -26,7 +26,7 @@
         <requires url="categories" version="1.1.3"/>
         <requires url="notifications" version="5.9.1"/>
         <requires url="oacs-dav" version="1.1b1"/>
-        <requires url="rss-support" version="0.3"/>
+        <requires url="rss-support" version="0.5d1"/>
 
         <callbacks>
             <callback type="after-install"  proc="fs::install::package_install"/>
Index: openacs-4/packages/file-storage/www/folder-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.adp,v
diff -u -r1.36 -r1.36.2.1
--- openacs-4/packages/file-storage/www/folder-chunk.adp	16 Jul 2018 16:43:49 -0000	1.36
+++ openacs-4/packages/file-storage/www/folder-chunk.adp	4 Dec 2020 10:56:19 -0000	1.36.2.1
@@ -16,10 +16,12 @@
   </p>
 </if>
 
-<if @feeds:rowcount@ not nil and @feeds:rowcount@ gt 0>
-  <ul>
-    <multiple name="feeds">
-      <li><a href="rss/@feeds.subscr_id@/rss.xml"><img src="/resources/acs-subsite/xml.gif" width="36" height="14" alt="RSS feed" style="border: 0; padding: 0px 5px;">@feeds.short_name@</a></li>
-    </multiple>
-  </ul>
+<if @expose_rss_p;literal@ true>
+  <if @feeds:rowcount@ not nil and @feeds:rowcount@ gt 0>
+    <ul>
+      <multiple name="feeds">
+        <li><a href="rss/@feeds.subscr_id@/rss.xml"><img src="/resources/acs-subsite/xml.gif" width="36" height="14" alt="RSS feed" style="border: 0; padding: 0px 5px;">@feeds.short_name@</a></li>
+      </multiple>
+    </ul>
+  </if>
 </if>
Index: openacs-4/packages/file-storage/www/folder-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.tcl,v
diff -u -r1.61.2.7 -r1.61.2.8
--- openacs-4/packages/file-storage/www/folder-chunk.tcl	1 Sep 2020 17:29:22 -0000	1.61.2.7
+++ openacs-4/packages/file-storage/www/folder-chunk.tcl	4 Dec 2020 10:56:19 -0000	1.61.2.8
@@ -88,6 +88,12 @@
 }
 
 set expose_rss_p [parameter::get -parameter ExposeRssP -package_id $package_id -default 0]
+
+# Disable RSS exposure if the RSS generation is disabled
+if {![parameter::get_global_value -package_key rss-support -parameter RssGenActiveP]} {
+    set expose_rss_p 0
+}
+
 set like_filesystem_p [parameter::get -parameter BehaveLikeFilesystemP -package_id $package_id -default 1]
 
 set target_window_name [parameter::get -parameter DownloadTargetWindowName -package_id $package_id -default ""]