Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 6 Apr 2016 09:28:20 +0000 (11:28 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 6 Apr 2016 09:28:20 +0000 (11:28 +0200)
Conflicts:
tine20/library/Zend/Locale/Format.php

Change-Id: Ieaa0b5363a5d48e521ea79b7c16b5cb5d47bacfe

1  2 
tests/tine20/Addressbook/JsonTest.php

@@@ -223,10 -223,9 +223,10 @@@ class Addressbook_JsonTest extends Test
                          "id": "ext-comp-1211",
                          "label": "Kontakte"
                      }
 -                ]';
 +                ]
 +            }]';
          $contacts = $this->_uit->searchContacts(Zend_Json::decode($filter), NULL);
 -        $this->assertGreaterThan(0, $contacts['totalcount']);
 +        $this->assertGreaterThanOrEqual(0, $contacts['totalcount']);
      }
  
      /**
@@@ -1860,7 -1859,7 +1860,7 @@@ Steuernummer 33/111/32212"
              'operator' => 'equals',
              'value'    => 'somename'
          ));
-         $result = $this->_instance->searchContacts($filter, '');
+         $result = $this->_uit->searchContacts($filter, '');
          $this->assertEquals(0, $result['totalcount']);
      }
  }