diff options
| author | Sam Tuke <samtuke@owncloud.com> | 2013-02-06 18:24:35 +0000 |
|---|---|---|
| committer | Sam Tuke <samtuke@owncloud.com> | 2013-02-06 18:24:35 +0000 |
| commit | 954a6274836e8fbf83fbbfb34fc89c250c7da13b (patch) | |
| tree | c0425ed63c0429e248931421145fb438db5983df | |
| parent | 2b07afc8ab5eddb53973f57a63e586ffde201809 (diff) | |
| download | nextcloud-server-954a6274836e8fbf83fbbfb34fc89c250c7da13b.tar.gz nextcloud-server-954a6274836e8fbf83fbbfb34fc89c250c7da13b.zip | |
Added comment
| -rwxr-xr-x | apps/files_encryption/lib/keymanager.php | 2 | ||||
| -rw-r--r-- | settings/ajax/changepassword.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php index 65efd387813..43af70dacc2 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 3bc88e6b664..ce4e326830c 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(); |