Commit 90319667 authored by Sebastian Kummer's avatar Sebastian Kummer

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

Merge pull request #551 in ZP/z-push from bugfix/ZP-1244-caldav-matching-default-calendars-fails-uppercase to develop

* commit '826d6c47':
  ZP-1244 use strcasecmp to compare CALDAV_PERSONAL and calendar id
parents 1ea1998c 826d6c47
...@@ -150,7 +150,7 @@ class BackendCalDAV extends BackendDiff { ...@@ -150,7 +150,7 @@ class BackendCalDAV extends BackendDiff {
$folder->displayname = $val->displayname; $folder->displayname = $val->displayname;
$folder->serverid = $id; $folder->serverid = $id;
if ($id[0] == "C") { if ($id[0] == "C") {
if (defined('CALDAV_PERSONAL') && strtolower(substr($id, 1)) == CALDAV_PERSONAL) { if (defined('CALDAV_PERSONAL') && strcasecmp(substr($id, 1), CALDAV_PERSONAL) == 0) {
$folder->type = SYNC_FOLDER_TYPE_APPOINTMENT; $folder->type = SYNC_FOLDER_TYPE_APPOINTMENT;
} }
else { else {
...@@ -158,7 +158,7 @@ class BackendCalDAV extends BackendDiff { ...@@ -158,7 +158,7 @@ class BackendCalDAV extends BackendDiff {
} }
} }
else { else {
if (defined('CALDAV_PERSONAL') && strtolower(substr($id, 1)) == CALDAV_PERSONAL) { if (defined('CALDAV_PERSONAL') && strcasecmp(substr($id, 1), CALDAV_PERSONAL) == 0) {
$folder->type = SYNC_FOLDER_TYPE_TASK; $folder->type = SYNC_FOLDER_TYPE_TASK;
} }
else { else {
......
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