Merge branch '2016.11-develop' into 2017.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Aug 2017 16:13:12 +0000 (18:13 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Aug 2017 16:13:12 +0000 (18:13 +0200)
Change-Id: Iad17b97340d785195cec6072c999a2eff63bd489

tine20/Tinebase/Export/Abstract.php
tine20/composer.lock

index a867147..36f7d31 100644 (file)
@@ -573,6 +573,10 @@ abstract class Tinebase_Export_Abstract implements Tinebase_Record_IteratableInt
         $this->_twigEnvironment->addFunction(new Twig_SimpleFunction('dateFormat', function ($date, $format) {
             return Tinebase_Translation::dateToStringInTzAndLocaleFormat($date, null, null, $format);
         }));
+        $this->_twigEnvironment->addFunction(new Twig_SimpleFunction('relationTranslateModel', function ($model) {
+            // TODO implement this!
+            return $model;
+        }));
 
         $this->_twigTemplate = $this->_twigEnvironment->load($this->_templateFileName);
     }
@@ -821,6 +825,7 @@ abstract class Tinebase_Export_Abstract implements Tinebase_Record_IteratableInt
 
                     foreach ($this->_foreignIdFields as $name => $controller) {
                         if (!empty($record->{$name})) {
+                            /** @var Tinebase_Controller_Record_Abstract $controller */
                             $controller = $controller::getInstance();
                             $record->{$name} = $controller->get($record->{$name});
                         }
index 90ecd5a..6a612a3 100644 (file)
         },
         {
             "name": "zendframework/zendframework1",
-            "version": "1.12.20pl14",
+            "version": "1.12.20pl15",
             "source": {
                 "type": "git",
                 "url": "http://git.tine20.org/git/zendframework1",
-                "reference": "d695a820a69d9d675d97a67ba79db4e8045dc5aa"
+                "reference": "c43f4aa3d0853ab685e75eed24d361b6ace30bff"
             },
             "require": {
                 "php": ">=5.3.0"
         {
             "alias": "1.12.20",
             "alias_normalized": "1.12.20.0",
-            "version": "1.12.20.0-patch14",
+            "version": "1.12.20.0-patch15",
             "package": "zendframework/zendframework1"
         },
         {