Merge branch '2014.11' into 2014.11-develop
[tine20] / tine20 / Tinebase / Controller / Record / Abstract.php
index 681091f..ad8be76 100644 (file)
@@ -979,7 +979,9 @@ abstract class Tinebase_Controller_Record_Abstract
             . ' Doing concurrency check ...');
 
         $modLog = Tinebase_Timemachine_ModificationLog::getInstance();
-        $modLog->manageConcurrentUpdates($_record, $_currentRecord);
+        $modLog->manageConcurrentUpdates(
+            Tinebase_Application::getInstance()->getApplicationByName($this->_applicationName)->getId(),
+            $_record, $_currentRecord);
         $modLog->setRecordMetaData($_record, 'update', $_currentRecord);
     }