Merge pull request #674 in ZP/z-push from...

Merge pull request #674 in ZP/z-push from bugfix/ZP-1383-carddav-last-character-of-note-trimmed to develop

* commit '5be4d255':
  ZP-1383 Fix carddav last character of note trimmed. Released under the Affero GNU General Public License (AGPL) version 3.

src/backend/carddav/carddav.php

@@ -1285,7 +1285,7 @@ class BackendCardDAV extends BackendDiff implements ISearchProvider {
             $val = str_replace("\n", "\\n", $val);
 
             // Remove trailing ;
-            $val = substr($val, 0, -1);
+            $val = rtrim($val, ";");
             // Clean full name from emailaddress
             if (substr($k, 0, 5) == 'email') {
                 $val = preg_replace(array('/.*</', '/>.*/'), array('', ''), $val);