diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-06-27 12:59:59 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-06-27 12:59:59 +0200 |
| commit | 4d6019b73fd8b1a1d8e8fecbeb129bea12feb89d (patch) | |
| tree | cfdc25706887a4447ae19c67979c4a0e65234b97 | |
| parent | 4b5bf606cbb60ac4e57088aff518e1e0e745873f (diff) | |
| parent | ef4057d3820020c40e2a1a31c5a0cae49700e110 (diff) | |
| download | nextcloud-server-4d6019b73fd8b1a1d8e8fecbeb129bea12feb89d.tar.gz nextcloud-server-4d6019b73fd8b1a1d8e8fecbeb129bea12feb89d.zip | |
Merge pull request #9247 from owncloud/move-webdav-class-to-core-master
Move webdav class to core master
| -rw-r--r-- | apps/files_external/appinfo/app.php | 1 | ||||
| -rw-r--r-- | apps/files_sharing/tests/externalstorage.php | 2 | ||||
| -rw-r--r-- | lib/private/files/storage/dav.php (renamed from apps/files_external/lib/webdav.php) | 0 |
3 files changed, 0 insertions, 3 deletions
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php index e88880fe516..3b8793a075b 100644 --- a/apps/files_external/appinfo/app.php +++ b/apps/files_external/appinfo/app.php @@ -10,7 +10,6 @@ $l = \OC_L10N::get('files_external'); OC::$CLASSPATH['OC\Files\Storage\StreamWrapper'] = 'files_external/lib/streamwrapper.php'; OC::$CLASSPATH['OC\Files\Storage\FTP'] = 'files_external/lib/ftp.php'; -OC::$CLASSPATH['OC\Files\Storage\DAV'] = 'files_external/lib/webdav.php'; OC::$CLASSPATH['OC\Files\Storage\OwnCloud'] = 'files_external/lib/owncloud.php'; OC::$CLASSPATH['OC\Files\Storage\Google'] = 'files_external/lib/google.php'; OC::$CLASSPATH['OC\Files\Storage\Swift'] = 'files_external/lib/swift.php'; diff --git a/apps/files_sharing/tests/externalstorage.php b/apps/files_sharing/tests/externalstorage.php index b7797333c10..60c5787f295 100644 --- a/apps/files_sharing/tests/externalstorage.php +++ b/apps/files_sharing/tests/externalstorage.php @@ -22,8 +22,6 @@ require_once __DIR__ . '/base.php'; -require_once __DIR__ . '/../../files_external/lib/webdav.php'; - /** * Tests for the external Storage class for remote shares. */ diff --git a/apps/files_external/lib/webdav.php b/lib/private/files/storage/dav.php index 8536c65ace9..8536c65ace9 100644 --- a/apps/files_external/lib/webdav.php +++ b/lib/private/files/storage/dav.php |