Merge pull request #3439 from jeromenadaud/hotfix-stockavailable

// Parse error
PrestaShop · Jul 16, 2015 · a08fe95 · a08fe95
2 parents 4241a15 + 21af081
commit a08fe95
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/classes/stock/StockAvailable.php b/classes/stock/StockAvailable.php
@@ -646,6 +646,7 @@ public static function resetProductFromStockAvailableByShopGroup(ShopGroup $shop
     {
         if ($shop_group->share_stock) {
             $shop_list = Shop::getShops(false, $shop_group->id, true);
+        }
 
         if (count($shop_list) > 0) {
             $id_shops_list = implode(', ', $shop_list);

diff --git a/controllers/admin/AdminCustomerThreadsController.php b/controllers/admin/AdminCustomerThreadsController.php
@@ -1060,10 +1060,10 @@ public function syncImap()
                         $cm = new CustomerMessage();
                         $cm->id_customer_thread = $ct->id;
                         $cm->message = $message;
+
                         if (!Validate::isCleanHtml($message)) {
                             $str_errors.= Tools::displayError(sprintf('Invalid Message Content for subject: %1s', $subject));
-                        }
-                        else {
+                        } else {
                             $cm->add();
                         }
                     }