diff --git a/htdocs/always.php b/htdocs/always.php index b21a1051..f78dfd1b 100644 --- a/htdocs/always.php +++ b/htdocs/always.php @@ -316,7 +316,7 @@ function ConstructURL( $partial_path, $force_script = false ) { $url = preg_replace('#^https?://[^/]+#', '', $url ); // Remove any protocol + hostname portion if ( strstr($url, 'caldav.php/caldav.php') !== false ) { - trace_bug('Duplicated caldav.php/ in URL "%s" from partial_path=%s, force_script=%s', $url, $partial_path, ($force_script?'true':'false')); +// trace_bug('Duplicated caldav.php/ in URL "%s" from partial_path=%s, force_script=%s', $url, $partial_path, ($force_script?'true':'false')); $url = str_replace( 'caldav.php/caldav.php', 'caldav.php', $url ); // Ensure we don't double any 'caldav.php/' } diff --git a/inc/always.php.in b/inc/always.php.in index cbea3bc5..c7e90312 100644 --- a/inc/always.php.in +++ b/inc/always.php.in @@ -316,7 +316,7 @@ function ConstructURL( $partial_path, $force_script = false ) { $url = preg_replace('#^https?://[^/]+#', '', $url ); // Remove any protocol + hostname portion if ( strstr($url, 'caldav.php/caldav.php') !== false ) { - trace_bug('Duplicated caldav.php/ in URL "%s" from partial_path=%s, force_script=%s', $url, $partial_path, ($force_script?'true':'false')); +// trace_bug('Duplicated caldav.php/ in URL "%s" from partial_path=%s, force_script=%s', $url, $partial_path, ($force_script?'true':'false')); $url = str_replace( 'caldav.php/caldav.php', 'caldav.php', $url ); // Ensure we don't double any 'caldav.php/' }