From a0d9283306d85bc5b3cc8f94a7f4a4962ccca252 Mon Sep 17 00:00:00 2001
From: Davo Smith <git@davosmith.co.uk>
Date: Wed, 5 Dec 2012 14:05:24 +0000
Subject: [PATCH] MDL-37014 repository_webdav - strip the server URL from file
 & folder paths returned by webdav lib (if present)

Conflicts:
	repository/webdav/lib.php
---
 repository/webdav/lib.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/repository/webdav/lib.php b/repository/webdav/lib.php
index bcef83a2f5e..5cdd7217572 100644
--- a/repository/webdav/lib.php
+++ b/repository/webdav/lib.php
@@ -138,6 +138,9 @@ class repository_webdav extends repository {
                 $filedate = '';
             }
 
+            // Remove the server URL from the path (if present), otherwise links will not work - MDL-37014
+            $server = preg_quote($this->options['webdav_server']);
+            $v['href'] = preg_replace("#https?://{$server}#", '', $v['href']);
             if (!empty($v['resourcetype']) && $v['resourcetype'] == 'collection') {
                 // a folder
                 if (ltrim($path, '/') != urldecode(ltrim($v['href'], '/'))) {