[Pkg-owncloud-commits] [owncloud] 112/122: Merge pull request #16035 from owncloud/issue-15975-occ-encryption-enable-warning-no-module

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 234429895485c1003cad7e001e7ba88ec13343f5
Merge: 12b24ee 10144bd
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Thu May 7 12:03:30 2015 +0200

    Merge pull request #16035 from owncloud/issue-15975-occ-encryption-enable-warning-no-module
    
    Display a message when there is a problem with the default module

 core/command/encryption/disable.php           |  2 +-
 core/command/encryption/enable.php            | 26 ++++++++++++--
 core/register_command.php                     |  2 +-
 tests/core/command/encryption/disabletest.php |  2 +-
 tests/core/command/encryption/enabletest.php  | 50 +++++++++++++++++++--------
 5 files changed, 62 insertions(+), 20 deletions(-)

diff --cc core/register_command.php
index 5e16abc,8d18b04..801148a
--- a/core/register_command.php
+++ b/core/register_command.php
@@@ -51,10 -51,9 +51,10 @@@ if (\OC::$server->getConfig()->getSyste
  	$application->add(new OC\Core\Command\Background\WebCron(\OC::$server->getConfig()));
  	$application->add(new OC\Core\Command\Background\Ajax(\OC::$server->getConfig()));
  	$application->add(new OC\Core\Command\Encryption\Disable(\OC::$server->getConfig()));
- 	$application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig()));
+ 	$application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig(), \OC::$server->getEncryptionManager()));
  	$application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->getEncryptionManager()));
  	$application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager()));
 +	$application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
  } else {
  	$application->add(new OC\Core\Command\Maintenance\Install(\OC::$server->getConfig()));
  }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git