diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-23 10:39:12 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-23 10:39:12 +0200 |
| commit | f6e8a388a90fff82c16589cf09911ef3aeb4005d (patch) | |
| tree | a47f16ed41fa3b884a4d709ef09136a4d0c785d0 /apps/files_encryption/appinfo | |
| parent | 82cbbb8ab8cfe81559c45905d7fca819d71df346 (diff) | |
| parent | 9851f0f4f2a97dc6ac1382bcd533eb23feffa4e0 (diff) | |
| download | nextcloud-server-f6e8a388a90fff82c16589cf09911ef3aeb4005d.tar.gz nextcloud-server-f6e8a388a90fff82c16589cf09911ef3aeb4005d.zip | |
Merge branch 'master' into encryption_improved_error_messages_4617
Conflicts:
settings/ajax/changepassword.php
Diffstat (limited to 'apps/files_encryption/appinfo')
| -rw-r--r-- | apps/files_encryption/appinfo/app.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php index cd26cd10cd9..c930ac9eca8 100644 --- a/apps/files_encryption/appinfo/app.php +++ b/apps/files_encryption/appinfo/app.php @@ -25,7 +25,9 @@ if (!OC_Config::getValue('maintenance', false)) { // App manager related hooks OCA\Encryption\Helper::registerAppHooks(); - stream_wrapper_register('crypt', 'OCA\Encryption\Stream'); + if(!in_array('crypt', stream_get_wrappers())) { + stream_wrapper_register('crypt', 'OCA\Encryption\Stream'); + } // check if we are logged in if (OCP\User::isLoggedIn()) { |