Merge branch 'main' into next

OpenMage · Sep 19, 2023 · 0f23ffd · 0f23ffd
2 parents 787c1ea + df74ac1
commit 0f23ffd
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 31 deletions.
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php
@@ -290,7 +290,10 @@ protected function _prepareColumns()
             ]
         );
 
-        if (Mage::helper('catalog')->isModuleEnabled('Mage_Rss')) {
+        if (Mage::helper('catalog')->isModuleEnabled('Mage_Rss') &&
+            Mage::helper('rss')->isRssEnabled() &&
+            Mage::getStoreConfigFlag('rss/catalog/notifystock')
+        ) {
             $this->addRssList('rss/catalog/notifystock', Mage::helper('catalog')->__('Notify Low Stock RSS'));
         }
 

diff --git a/composer.lock b/composer.lock
diff --git a/js/varien/js.js b/js/varien/js.js
@@ -33,6 +33,7 @@ function setPLocation(url, setFocus){
  *
  * @param elements - array of elements to be decorated
  * [@param decorateParams] - array of classes to be set. If omitted, all available will be used
+ * @deprecated
  */
 function decorateGeneric(elements, decorateParams)
 {
@@ -81,6 +82,7 @@ function decorateGeneric(elements, decorateParams)
 /**
  * Decorate table rows and cells, tbody etc
  * @see decorateGeneric()
+ * @deprecated
  */
 function decorateTable(table, options) {
     var table = $(table);
@@ -126,6 +128,7 @@ function decorateTable(table, options) {
 /**
  * Set "odd", "even" and "last" CSS classes for list items
  * @see decorateGeneric()
+ * @deprecated
  */
 function decorateList(list, nonRecursive) {
     if ($(list)) {
@@ -142,6 +145,7 @@ function decorateList(list, nonRecursive) {
 /**
  * Set "odd", "even" and "last" CSS classes for list items
  * @see decorateGeneric()
+ * @deprecated
  */
 function decorateDataList(list) {
     list = $(list);