[Pkg-owncloud-commits] [owncloud] 34/457: fix references to legacy encryption app name

[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 a0c6c01137a707aab58622dbfc0dba76661386da
Author: Clark Tomlinson <fallen013 at gmail.com>
Date:   Thu Apr 30 13:02:27 2015 -0400

    fix references to legacy encryption app name
---
 apps/files_trashbin/lib/helper.php     | 2 +-
 apps/files_trashbin/lib/trashbin.php   | 2 +-
 apps/files_trashbin/tests/trashbin.php | 2 +-
 core/command/user/resetpassword.php    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php
index bc9ebd6..5d244d7 100644
--- a/apps/files_trashbin/lib/helper.php
+++ b/apps/files_trashbin/lib/helper.php
@@ -115,7 +115,7 @@ class Helper
 			$entry['id'] = $id++;
 			$entry['etag'] = $entry['mtime']; // add fake etag, it is only needed to identify the preview image
 			$entry['permissions'] = \OCP\Constants::PERMISSION_READ;
-			if (\OCP\App::isEnabled('files_encryption')) {
+			if (\OCP\App::isEnabled('encryption')) {
 				$entry['isPreviewAvailable'] = false;
 			}
 			$files[] = $entry;
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 31d77c0..35cb500 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -476,7 +476,7 @@ class Trashbin {
 	 */
 	private static function deleteEncryptionKeys(\OC\Files\View $view, $file, $filename, $timestamp, $user) {
 		$size = 0;
-		if (\OCP\App::isEnabled('files_encryption')) {
+		if (\OCP\App::isEnabled('encryption')) {
 
 			$keyfiles = \OC\Files\Filesystem::normalizePath('files_trashbin/keys/' . $filename);
 
diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php
index 85c47b5..12f2900 100644
--- a/apps/files_trashbin/tests/trashbin.php
+++ b/apps/files_trashbin/tests/trashbin.php
@@ -67,7 +67,7 @@ class Test_Trashbin extends \Test\TestCase {
 		$application->setupPropagation();
 
 		//disable encryption
-		\OC_App::disable('files_encryption');
+		\OC_App::disable('encryption');
 
 		//configure trashbin
 		self::$rememberRetentionObligation = \OC_Config::getValue('trashbin_retention_obligation', Files_Trashbin\Trashbin::DEFAULT_RETENTION_OBLIGATION);
diff --git a/core/command/user/resetpassword.php b/core/command/user/resetpassword.php
index 7c40559..3e4b41c 100644
--- a/core/command/user/resetpassword.php
+++ b/core/command/user/resetpassword.php
@@ -78,7 +78,7 @@ class ResetPassword extends Command {
 			/** @var $dialog \Symfony\Component\Console\Helper\DialogHelper */
 			$dialog = $this->getHelperSet()->get('dialog');
 
-			if (\OCP\App::isEnabled('files_encryption')) {
+			if (\OCP\App::isEnabled('encryption')) {
 				$output->writeln(
 					'<error>Warning: Resetting the password when using encryption will result in data loss!</error>'
 				);

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