Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 17 Sep 2013 13:45:50 +0000 (15:45 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 17 Sep 2013 13:45:50 +0000 (15:45 +0200)
Conflicts:
tine20/Felamimail/translations/de.po
tine20/Tinebase/Record/Abstract.php

1  2 
tests/tine20/Calendar/Controller/EventNotificationsTests.php
tests/tine20/Calendar/JsonTests.php
tests/tine20/Felamimail/JsonTest.php
tine20/ActiveSync/Controller/Calendar.php
tine20/Calendar/Model/Event.php
tine20/Filemanager/js/NodeGridPanel.js
tine20/Tinebase/Record/Abstract.php

Simple merge
Simple merge
Simple merge
@@@ -921,7 -993,7 +919,7 @@@ abstract class Tinebase_Record_Abstrac
       * returns a Tinebase_Record_Diff record with differences to the given record
       * 
       * @param Tinebase_Record_Interface $_record record for comparison
--     * @param $_omitFields omit fields
++     * @param array $omitFields omit fields (for example modlog fields)
       * @return Tinebase_Record_Diff|NULL
       */
      public function diff($_record, $omitFields = array())
          ));
          $diff = array();
          foreach (array_keys($this->_validators) as $fieldName) {
-             // omit modlog fields, if set
 -            
              if (in_array($fieldName, $omitFields)) {
                  continue;
              }