Merge branch 'master' of https://github.com/thelia/thelia

core/lib/Thelia/Action/BaseCachedFile.php

@@ -159,7 +159,7 @@ abstract class BaseCachedFile extends BaseAction
         // Create directory (recursively) if it does not exists.
         if ($create_if_not_exists && !is_dir($path)) {
             if (!@mkdir($path, 0777, true)) {
-                throw new \RuntimeException(sprintf("Failed to create %s/%s file in cache directory",  $cache_base));
+                throw new \RuntimeException(sprintf("Failed to create %s file in cache directory",  $path));
             }
         }
 

core/lib/Thelia/Core/Template/Loop/Accessory.php

@@ -123,10 +123,11 @@ class Accessory extends Product
         foreach ($results as $loopResultRow) {
 
             $accessoryProductId = $loopResultRow->get('ID');
-
+            \Thelia\Log\Tlog::getInstance()->notice($this->accessoryId);
             $loopResultRow
                 ->set("ID"      , $this->accessoryId[$accessoryProductId])
                 ->set("POSITION", $this->accessoryPosition[$accessoryProductId])
+                ->set("ACCESSORY_ID", $accessoryProductId)
                 ;
         }
 

core/lib/Thelia/Core/Template/Loop/AssociatedContent.php

@@ -166,6 +166,7 @@ class AssociatedContent extends Content
                 ->set("ID"        , $this->contentId[$relatedContentId])
                 ->set("CONTENT_ID", $relatedContentId)
                 ->set("POSITION"  , $this->contentPosition[$relatedContentId])
+
             ;
         }
 

core/lib/Thelia/Core/Template/Loop/Document.php

@@ -267,7 +267,7 @@ class Document extends BaseI18nLoop implements PropelSearchLoopInterface
                 $loopResult->addRow($loopResultRow);
             } catch (\Exception $ex) {
                 // Ignore the result and log an error
-                Tlog::getInstance()->addError("Failed to process document in document loop: ", $this->args);
+                Tlog::getInstance()->addError(sprintf("Failed to process document in document loop: %s", $ex->getMessage()), $this->args);
             }
         }