From: Clark Tomlinson <fallen013@gmail.com>
Date: Thu, 16 Apr 2015 13:45:09 +0000 (-0400)
Subject: Merge pull request #15675 from owncloud/enc_error_messages
X-Git-Tag: v8.1.0alpha2~59
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ac133e9faa0a3568716596e83c5ff0993c8dcf89;p=nextcloud-server.git

Merge pull request #15675 from owncloud/enc_error_messages

[encryption] display warning if password changed or if the keys are not initialized
---

ac133e9faa0a3568716596e83c5ff0993c8dcf89
diff --cc apps/encryption/appinfo/app.php
index 0e8ce56227b,cbc50e683e6..0c7c231aef7
--- a/apps/encryption/appinfo/app.php
+++ b/apps/encryption/appinfo/app.php
@@@ -23,9 -23,9 +23,11 @@@
  
  namespace OCA\Encryption\AppInfo;
  
+ \OCP\Util::addscript('encryption', 'encryption');
+ 
  $app = new Application();
 -$app->registerEncryptionModule();
 -$app->registerHooks();
 -$app->registerSettings();
 +if (\OC::$server->getEncryptionManager()->isReady()) {
 +	$app->registerEncryptionModule();
 +	$app->registerHooks();
 +	$app->registerSettings();
 +}