Commit eedfbfba authored by Sebastian Kummer's avatar Sebastian Kummer

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

Merge pull request #576 in ZP/z-push from bugfix/ZP-1269-carddav-backend-newlines-result-in to develop

* commit 'd7d37d76': (185 commits)
  ZP-1269 Bugfix carddav backend support newlines in note field. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1269 Bugfix carddav backend support newlines in note field. Released under the Affero GNU General Public License (AGPL) version 3.
  Merge pull request #509 in ZP/z-push from develop to release/2.3
  ZP-250 Release/2.3 should log INFO by default.
  ZP-961 Bumped version.
  ZP-961 Bumped version, updated line endings.
  Merge pull request #290 in ZP/z-push from bugfix/ZP-884-zcp--gethierarchy-is-broken to develop
  Merge pull request #288 in ZP/z-push from bugfix/ZP-971-don-t-fail-when-source-message-id to develop
  Merge pull request #285 in ZP/z-push from feature/ZP-964-pass-z-push-version-in-an-additional to develop
  Merge pull request #283 in ZP/z-push from bugfix/ZP-970-printwbxml-use-files to develop
  ZP-961 Bumped version to 2.2.11beta1. Removed newlines.
  Merge pull request #205 in ZP/z-push from bugfix/ZP-881-change-zcp-server-location-for-listfolders to develop
  Merge pull request #244 in ZP/z-push from bugfix/ZP-935-devicedata-is-deleted-when-requesting to develop
  Merge pull request #236 in ZP/z-push from bugfix/ZP-930-z-push-top-doesn-t-work-in-another to develop
  Merge pull request #191 in ZP/z-push from bugfix/ZP-872-ping-doesn-t-catch-all-notifications to develop
  ZP-959 Format time output at the end of the request to match memory usage format.
  ZP-957 Timezone DayOfWeek and week are switched when packing.
  ZP-854 Bumped version to 2.2.10.
  ZP-854 Bumped to 2.2.10 beta1.
  ZP-854 Bumped version. Fixed line endings.
  ...
parents 8b3b4b01 d7d37d76
......@@ -1266,6 +1266,9 @@ class BackendCardDAV extends BackendDiff implements ISearchProvider {
}
if (empty($val) || preg_match('/^(\;)+$/', $val) == 1)
continue;
// Support newlines in values
$val = str_replace("\n", "\\n", $val);
// Remove trailing ;
$val = substr($val, 0, -1);
if (strlen($val) > 50) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment