Commit 1381ceb5 authored by Sebastian Kummer's avatar Sebastian Kummer

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

Merge pull request #624 in ZP/z-push from bugfix/ZP-1324-carddav-message-asbody-data-null to develop

* commit 'ea955f4b':
  ZP-1324 Review comment. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1324 Carddav, $message->asbody->data can be NULL. Released under the Affero GNU General Public License (AGPL) version 3.
parents a10c5938 ea955f4b
......@@ -1276,7 +1276,7 @@ class BackendCardDAV extends BackendDiff implements ISearchProvider {
$val .= $this->escape($message->$i);
$val.=';';
}
if ($k == 'body' && isset($message->asbody)) {
if ($k == 'body' && isset($message->asbody->data)) {
$val = stream_get_contents($message->asbody->data);
}
if (empty($val) || preg_match('/^(\;)+$/', $val) == 1)
......
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