nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-08-03 14:09:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Fatal PHP Error if Depth is more than 1.

Browse Source 
Merge request was proposed by xhess on GitLab, but the commit
had no content. I've solved it, possibly the same way.

For the initial commit:
Executing the second example at https://wiki.davical.org/index.php?title=PROPFIND
The "Depth: 2" header is the problem. Setting the depth header larger than 1
causes the function "compare_val_with_re" to be defined again. Now checking if
the function has already been defined fixes the problem.
This commit is contained in:
Andrew Ruthven 2018-11-12 19:32:34 +13:00
parent 872f4fc6ad
commit 48efbb272b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/caldav-PROPFIND.php
View File

@ -105,7 +105,9 @@ function get_collection_contents( $depth, $collection, $parent_path = null ) {
global $c, $session, $request, $reply, $property_list;
// for http header comparison
function compare_val_with_re($val, $re){ return preg_match($re, $val)===1 ? 0 : 1; }
if (! function_exists ('compare_val_with_re') ) {
function compare_val_with_re($val, $re){ return preg_match($re, $val)===1 ? 0 : 1; }
}
$bound_from = $collection->bound_from();
$bound_to = $collection->dav_name();