From 4d0cbd84f34f11db7500ed8fc85d4ee06f419d1e Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Wed, 19 Apr 2023 18:14:31 +0200
Subject: [PATCH] reverted minor merge issue

---
 Layout/default/Preorder/Index.php | 2 +-
 application/Contract/Contract.php | 5 -----
 application/Product/Product.php   | 4 ++--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index c1c05d261..4b3b3a097 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -212,7 +212,7 @@
               </tr>
               <?php foreach($preorders as $preorder): ?>
               <tr>
-                <?php //if(!$me->is("preorderfront")): ?><td><?=$preorder->campaign->name?></td><?php //endif; ?>
+                <?php if(!$me->is("preorderfront")): ?><td><?=$preorder->campaign->name?></td><?php endif; ?>
                 <td><?=__($preorder->type, "preorder")?></td>
                 <td>Aufgenommen</td>
                 <?php if($preorder->building_id): ?>
diff --git a/application/Contract/Contract.php b/application/Contract/Contract.php
index 8700b0b20..7cdda9229 100644
--- a/application/Contract/Contract.php
+++ b/application/Contract/Contract.php
@@ -208,11 +208,6 @@ class Contract extends mfBaseModel {
         return $this->journals;
       }
       
-      if($name == "journals") {
-        $this->journals = array_reverse(ContractjournalModel::search(["contract_id" => $this->id]));
-        return $this->journals;
-      }
-      
       if($name == "links") {
         $this->links = ContractLinkModel::includesContractId($this->id, ["type" => $link]);
         //var_dump($this->links);exit;
diff --git a/application/Product/Product.php b/application/Product/Product.php
index 7d4d0e423..7f254e70c 100644
--- a/application/Product/Product.php
+++ b/application/Product/Product.php
@@ -9,12 +9,12 @@ class Product extends mfBaseModel {
   private $attributes;
   
   public function loadAttributes() {
+    $this->attributes = [];
+    
     if(!$this->producttech_id) {
       return [];
     }
     
-    $this->attributes = [];
-    
     // get tech attribs
     $ptattribs = mfValuecache::singleton()->get("ProducttechAttributes-techid-".$this->producttech_id);
     if($ptattribs === null) {