diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-03-30 22:45:58 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-07 13:30:28 +0200 |
| commit | 1b42b492dce562596b8b57a11546728f697c4f38 (patch) | |
| tree | 6280aa40baaf55db44edf84a906b83db2d47fc46 /lib/private/server.php | |
| parent | dbdd754c3fc37dc3100a9741f956d913e6d64576 (diff) | |
| download | nextcloud-server-1b42b492dce562596b8b57a11546728f697c4f38.tar.gz nextcloud-server-1b42b492dce562596b8b57a11546728f697c4f38.zip | |
kill OC_FileProxy :boom:
Diffstat (limited to 'lib/private/server.php')
| -rw-r--r-- | lib/private/server.php | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/lib/private/server.php b/lib/private/server.php index d9c580c0f0c..d135150c1f7 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -496,19 +496,7 @@ class Server extends SimpleContainer implements IServerContainer { $dir = '/files'; if (!$folder->nodeExists($dir)) { $folder = $folder->newFolder($dir); - - if (\OCP\App::isEnabled('files_encryption')) { - // disable encryption proxy to prevent recursive calls - $proxyStatus = \OC_FileProxy::$enabled; - \OC_FileProxy::$enabled = false; - } - \OC_Util::copySkeleton($user, $folder); - - if (\OCP\App::isEnabled('files_encryption')) { - // re-enable proxy - our work is done - \OC_FileProxy::$enabled = $proxyStatus; - } } else { $folder = $folder->get($dir); } |