Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 31 Jan 2017 14:54:08 +0000 (15:54 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 31 Jan 2017 14:54:08 +0000 (15:54 +0100)
Change-Id: Ic4c1c847242fa32a90271bd7115f9d3b50267199

1  2 
tests/tine20/Calendar/Frontend/ActiveSyncTest.php
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Calendar/Model/Rrule.php
tine20/Setup/Frontend/Cli.php
tine20/Tinebase/Frontend/Cli.php
tine20/Tinebase/Import/Abstract.php

@@@ -848,9 -846,7 +848,8 @@@ class Felamimail_Frontend_JsonTest exte
                  $originalMessage = $mail;
              }
          }
 -        $this->assertTrue(isset($replyMessageFound['id']), 'replied message not found');
 +
-         $this->assertTrue(isset($replyMessageFound['id']) && isset($originalMessage['id']));
++        $this->assertTrue(isset($replyMessageFound['id']) && isset($originalMessage['id']), 'replied message not found');
          $replyMessageFound = $this->_json->getMessage($replyMessageFound['id']);
          $originalMessage = $this->_json->getMessage($originalMessage['id']);
          
Simple merge
Simple merge
Simple merge
Simple merge