Merge branch 'hotfix/2.6.2'

isotope · Sep 17, 2019 · 348a595 · 348a595
2 parents 9265ce5 + c62cb70
commit 348a595
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     },
     "require":{
         "php": "~5.4 || ~7.0",
-        "contao/core-bundle": "^3.5.2 || ~4.1",
+        "contao/core-bundle": "^3.5.2 || ~4.2",
         "contao-community-alliance/composer-plugin": "~2.4 || ~3.0",
         "terminal42/contao-conditionalselectmenu":"^3.0.3",
         "terminal42/dcawizard": "~2.3",
@@ -53,7 +53,6 @@
     },
     "conflict": {
         "terminal42/contao-fineuploader": "< 2.0 || >= 3.0",
-        "contao/core-bundle": "4.0.0 || 4.0.1",
         "contao/manager-plugin": "<2.0 || >= 3.0",
         "mpay24/mpay24-php": "< 4.0 || >= 5.0"
     },

diff --git a/system/modules/isotope/config/config.php b/system/modules/isotope/config/config.php
@@ -508,6 +508,10 @@
 $GLOBALS['TL_CRON']['daily'][] = array('Isotope\Automator', 'deleteOldOrders');
 $GLOBALS['TL_CRON']['daily'][] = array('Isotope\Automator', 'convertCurrencies');
 
+if (VERSION >= 4.0) {
+    $GLOBALS['TL_CRON']['daily'][] = array('Contao\Automator', 'rotateLogs');
+}
+
 
 /**
  * Auto_item keywords

diff --git a/system/modules/isotope/docs/CHANGELOG-2.6.md b/system/modules/isotope/docs/CHANGELOG-2.6.md
@@ -1,16 +1,26 @@
 Isotope eCommerce Changelog
 ===========================
 
-Version 2.6.1 (2019-08-28)
+Version 2.6.2 (2019-09-17)
 ---------------------------------
 
+### Fixed
+
+- Failed to generate product cache when showing old or new products (#2071)
+- StringUtil::trimsplit is not available in Contao 3.5 (#2067)
+- Correctly show upload errors in Contao 4 (#2070)
+- Filter error in product variant list (#2068)
+- Automatically rotate log files in Contao 4 (#2065)
+
+
+Version 2.6.1 (2019-08-28)
+---------------------------------
 
 ### Fixed
 
 - Product reader page shows articles of product list page (#2060)
 
 
-
 Version 2.6.0 (2019-08-27)
 ---------------------------------
 

diff --git a/system/modules/isotope/drivers/DC_ProductData.php b/system/modules/isotope/drivers/DC_ProductData.php
@@ -477,7 +477,7 @@ public function edit($intID = false, $ajaxId = false)
 
             if ($blnLanguageUpdated) {
                 \Session::getInstance()->setData($session);
-                $_SESSION['TL_INFO'] = '';
+                unset($_SESSION['TL_INFO']);
                 \Controller::reload();
             }
 

diff --git a/system/modules/isotope/library/Isotope/Isotope.php b/system/modules/isotope/library/Isotope/Isotope.php
@@ -44,7 +44,7 @@ class Isotope extends \Controller
     /**
      * Isotope version
      */
-    const VERSION = '2.6.0';
+    const VERSION = '2.6.2';
 
     /**
      * True if the system has been initialized

diff --git a/system/modules/isotope/library/Isotope/Model/Product/Standard.php b/system/modules/isotope/library/Isotope/Model/Product/Standard.php
@@ -435,7 +435,7 @@ public function generate(array $arrConfig)
                 return $text;
             }
 
-            $keywords = StringUtil::trimsplit(' |-', $keywords);
+            $keywords = trimsplit(' |-', $keywords);
             $keywords = array_filter(array_unique($keywords));
 
             foreach ($keywords as $word) {

diff --git a/system/modules/isotope/library/Isotope/Module/ProductList.php b/system/modules/isotope/library/Isotope/Module/ProductList.php
@@ -517,10 +517,10 @@ protected function getProductCacheExpiration()
         if ('show_new' === $this->iso_newFilter || 'show_old' === $this->iso_newFilter) {
             $added = \Database::getInstance()
                 ->execute("
-                    SELECT MIN(dateAdded)
+                    SELECT MIN(dateAdded) AS expires
                     FROM tl_iso_product
                     WHERE dateAdded>" . Isotope::getConfig()->getNewProductLimit() . "
-                ")
+                ")->expires
             ;
 
             if ($added < $expires) {

diff --git a/system/modules/isotope/library/Isotope/Module/ProductVariantList.php b/system/modules/isotope/library/Isotope/Module/ProductVariantList.php
@@ -34,7 +34,7 @@ protected function findProducts($arrCacheIds = null)
         $arrColumns    = array();
         $arrFilters = Isotope::getRequestCache()->getFiltersForModules($this->iso_filterModules);
         $arrCategories = $this->findCategories($arrFilters);
-        $queryBuilder = new FilterQueryBuilder($arrCategories);
+        $queryBuilder = new FilterQueryBuilder($arrFilters);
 
         $arrColumns[] = "(
             (tl_iso_product.pid=0 AND tl_iso_product.type NOT IN (SELECT id FROM tl_iso_producttype WHERE variants='1'))

diff --git a/system/modules/isotope/library/Isotope/Widget/MediaManager.php b/system/modules/isotope/library/Isotope/Widget/MediaManager.php
@@ -150,8 +150,12 @@ public function validateUpload()
         }
 
         if ($objUploader->hasError()) {
-            foreach ($_SESSION['TL_ERROR'] as $strError) {
-                $this->addError($strError);
+            $messages = VERSION >= 4.0 ? \System::getContainer()->get('session')->getFlashBag()->peek('contao_be_error') : $_SESSION['TL_ERROR'];
+
+            if (\is_array($messages)) {
+                foreach ($messages as $strError) {
+                    $this->addError($strError);
+                }
             }
         }