From 954a6274836e8fbf83fbbfb34fc89c250c7da13b Mon Sep 17 00:00:00 2001 From: Sam Tuke Date: Wed, 6 Feb 2013 18:24:35 +0000 Subject: [PATCH] Added comment --- apps/files_encryption/lib/keymanager.php | 2 +- settings/ajax/changepassword.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php index 65efd38781..43af70dacc 100755 --- a/apps/files_encryption/lib/keymanager.php +++ b/apps/files_encryption/lib/keymanager.php @@ -206,7 +206,7 @@ class Keymanager { * as no encryption takes place here */ public static function setPrivateKey( $key ) { - trigger_error("MOSH"); + $user = \OCP\User::getUser(); $view = new \OC_FilesystemView( '/' . $user . '/files_encryption' ); diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php index 3bc88e6b66..ce4e326830 100644 --- a/settings/ajax/changepassword.php +++ b/settings/ajax/changepassword.php @@ -4,6 +4,7 @@ OCP\JSON::callCheck(); OC_JSON::checkLoggedIn(); +// Manually load apps to ensure hooks work correctly (workaround for issue 1503) OC_APP::loadApps(); $username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();