Merge branch 'main' into next

empiricompany · Jul 12, 2023 · 54f8074 · 54f8074
2 parents b836666 + 8aae6e2
commit 54f8074
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php b/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php
@@ -151,7 +151,7 @@ public function matchEvent(Mage_Index_Model_Event $event)
             } else {
                 /** @var Mage_Core_Model_Store $store */
                 $store = $event->getDataObject();
-                if ($store && $store->isObjectNew()) {
+                if ($store && ($store->isObjectNew() || $store->getOrigData('is_active') != $store->getIsActive() && $store->getIsActive())) {
                     $result = true;
                 } else {
                     $result = false;

diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php
@@ -1400,6 +1400,9 @@ protected function _arrayNextKey(array $array, $key)
     public function reindexAll()
     {
         foreach (Mage::app()->getStores() as $storeId => $store) {
+            if (!$store->getIsActive()) {
+                continue;
+            }
             $this->prepareFlatTable($storeId);
             $this->beginTransaction();
             try {

diff --git a/app/code/core/Mage/Core/Block/Messages.php b/app/code/core/Mage/Core/Block/Messages.php
@@ -247,6 +247,7 @@ public function getGroupedHtml()
         if ($html) {
             $html .= '</' . $this->_messagesFirstLevelTagName . '>';
         }
+        $this->_messages = $this->getMessageCollection()->clear();
         return $html;
     }
 

diff --git a/app/code/core/Mage/Customer/Block/Form/Register.php b/app/code/core/Mage/Customer/Block/Form/Register.php
@@ -88,6 +88,10 @@ public function getFormData()
             if (isset($data['region_id'])) {
                 $data['region_id'] = (int)$data['region_id'];
             }
+            if ($data->getDob()) {
+                $dob = $data->getYear() . '-' . $data->getMonth() . '-' . $data->getDay();
+                $data->setDob($dob);
+            }
             $this->setData('form_data', $data);
         }
         return $data;