diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php index 65efd38781323855b3cf5482cac727112f503560..43af70dacc2be7a6b502bc68dd397130cbb738a2 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 3bc88e6b6647fc0f1fadb504b7846e5edc9b9bfa..ce4e326830c0bcd9e44bcbfcff1a4091c3644f33 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();