diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-06-11 15:19:02 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-06-11 15:19:02 +0200 |
| commit | 20ddd6e1c77224d18d5be74101b80144b7187475 (patch) | |
| tree | 1320acdc30a977f9294dc0ae2f6c36667982da31 /apps/files_encryption/lib | |
| parent | 64593e4b84fdd6881a43530461c50464303cc42e (diff) | |
| parent | db6080c5c682a2bbdc420399276b81311c17802c (diff) | |
| download | nextcloud-server-20ddd6e1c77224d18d5be74101b80144b7187475.tar.gz nextcloud-server-20ddd6e1c77224d18d5be74101b80144b7187475.zip | |
Merge branch 'master' into files_encryption_check_private_key
Conflicts:
apps/files_encryption/tests/crypt.php
Diffstat (limited to 'apps/files_encryption/lib')
| -rw-r--r-- | apps/files_encryption/lib/util.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php index 6446e83222e..d5a5ce774d2 100644 --- a/apps/files_encryption/lib/util.php +++ b/apps/files_encryption/lib/util.php @@ -289,7 +289,7 @@ class Util { */ public function recoveryEnabledForUser() { - $sql = 'SELECT `recovery_enabled` FROM `*PREFIX*encryption` WHERE uid = ?'; + $sql = 'SELECT `recovery_enabled` FROM `*PREFIX*encryption` WHERE `uid` = ?'; $args = array($this->userId); @@ -347,7 +347,7 @@ class Util { // Create a new record instead } else { - $sql = 'UPDATE `*PREFIX*encryption` SET recovery_enabled = ? WHERE uid = ?'; + $sql = 'UPDATE `*PREFIX*encryption` SET `recovery_enabled` = ? WHERE `uid` = ?'; $args = array( $enabled, @@ -1066,7 +1066,7 @@ class Util { */ public function setMigrationStatus($status) { - $sql = 'UPDATE `*PREFIX*encryption` SET migration_status = ? WHERE uid = ?'; + $sql = 'UPDATE `*PREFIX*encryption` SET `migration_status` = ? WHERE `uid` = ?'; $args = array( $status, @@ -1095,7 +1095,7 @@ class Util { */ public function getMigrationStatus() { - $sql = 'SELECT `migration_status` FROM `*PREFIX*encryption` WHERE uid = ?'; + $sql = 'SELECT `migration_status` FROM `*PREFIX*encryption` WHERE `uid` = ?'; $args = array($this->userId); |