Fix some edge cases

diff --git a/dav/common/calendar.fnk.php b/dav/common/calendar.fnk.php
index 14951119158b927df0d3b437add3aad5c86094f8..cd5efa57f3c5664f7867a34a548e2fb45fbe3a33 100644 (file)
--- a/dav/common/calendar.fnk.php
+++ b/dav/common/calendar.fnk.php
@@ -249,10 +249,11 @@ function dav_create_server($force_authentication = false, $needs_caldav = true,
                $server->addPlugin($carddavPlugin);
        }
 
-       $aclPlugin                      = new $GLOBALS["CALDAV_ACL_PLUGIN_CLASS"]();
-       $aclPlugin->defaultUsernamePath = "principals/users";
-       $server->addPlugin($aclPlugin);
-
+       if ($GLOBALS["CALDAV_ACL_PLUGIN_CLASS"] != "") {
+               $aclPlugin                      = new $GLOBALS["CALDAV_ACL_PLUGIN_CLASS"]();
+               $aclPlugin->defaultUsernamePath = "principals/users";
+               $server->addPlugin($aclPlugin);
+       }
 
        if ($force_authentication) $server->broadcastEvent('beforeMethod', array("GET", "/")); // Make it authenticate