diff options
| author | Sam Tuke <samtuke@owncloud.com> | 2013-02-06 17:59:47 +0000 |
|---|---|---|
| committer | Sam Tuke <samtuke@owncloud.com> | 2013-02-06 17:59:47 +0000 |
| commit | 2b07afc8ab5eddb53973f57a63e586ffde201809 (patch) | |
| tree | 5454e7da2e6a871cd71f00937c58341c968f4087 /apps | |
| parent | ae8cfe6569f3c23f162b2d36dfad3aeb3cf5b522 (diff) | |
| download | nextcloud-server-2b07afc8ab5eddb53973f57a63e586ffde201809.tar.gz nextcloud-server-2b07afc8ab5eddb53973f57a63e586ffde201809.zip | |
Removed debugging code
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_encryption/appinfo/app.php | 2 | ||||
| -rw-r--r-- | apps/files_encryption/hooks/hooks.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php index e426f237bbe..f83109a18ea 100644 --- a/apps/files_encryption/appinfo/app.php +++ b/apps/files_encryption/appinfo/app.php @@ -12,7 +12,7 @@ OC_FileProxy::register( new OCA\Encryption\Proxy() ); // User-related hooks OCP\Util::connectHook( 'OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login' ); -OCP\Util::connectHook( 'OC_User', 'post_setPassword','OCA\Encryption\Hooks', 'setPassphrase' ); +OCP\Util::connectHook( 'OC_User', 'pre_setPassword','OCA\Encryption\Hooks', 'setPassphrase' ); // Sharing-related hooks OCP\Util::connectHook( 'OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared' ); diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index 9a4aef79464..8bdeee0937b 100644 --- a/apps/files_encryption/hooks/hooks.php +++ b/apps/files_encryption/hooks/hooks.php @@ -107,7 +107,7 @@ class Hooks { * @param array $params keys: uid, password
*/
public static function setPassphrase( $params ) {
- trigger_error("HOSH");
+
// Only attempt to change passphrase if server-side encryption
// is in use (client-side encryption does not have access to
// the necessary keys)
|