Merge branch 'fronkdev' into 'master'

Preorder trigger: Fixed not replacing CIFTOKEN in cifurl

See merge request fronk/thetool!340

application/Preorder/Preorder.php

@@ -438,8 +438,8 @@ class Preorder extends mfBaseModel {
     $campaign = $this->getProperty("campaign");
     
     $cifurl = $campaign->cifurl;
-    str_replace("{{CIFTOKEN}}", $this->ciftoken, $cifurl);
-    
+    $cifurl = str_replace("{{CIFTOKEN}}", $this->ciftoken, $cifurl);
+
     return $cifurl;
   }