summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorFlorin Peter <github@florin-peter.de>2013-05-18 22:10:00 +0200
committerFlorin Peter <github@florin-peter.de>2013-05-18 22:10:00 +0200
commit681252669a237a2383bcdc05892e368785103ad2 (patch)
tree9c8e37847694df5365c97e8af01e71fcad9af3e8 /apps
parente0e89602a24c151cd27095f355812a200acbbb83 (diff)
downloadnextcloud-server-681252669a237a2383bcdc05892e368785103ad2.tar.gz
nextcloud-server-681252669a237a2383bcdc05892e368785103ad2.zip
changed migrationStatus to migration_status for pgsql
Diffstat (limited to 'apps')
-rw-r--r--apps/files_encryption/appinfo/database.xml2
-rw-r--r--apps/files_encryption/lib/util.php6
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/files_encryption/appinfo/database.xml b/apps/files_encryption/appinfo/database.xml
index 64c9ef65fa8..1935a4df6ad 100644
--- a/apps/files_encryption/appinfo/database.xml
+++ b/apps/files_encryption/appinfo/database.xml
@@ -28,7 +28,7 @@
<comments>Whether encryption key recovery is enabled</comments>
</field>
<field>
- <name>migrationStatus</name>
+ <name>migration_status</name>
<type>boolean</type>
<notnull>true</notnull>
<default>0</default>
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 9588db8d647..4e32cf6da14 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -1033,7 +1033,7 @@ class Util {
$sql = 'UPDATE
*PREFIX*encryption
SET
- migrationStatus = ?
+ migration_status = ?
WHERE
uid = ?';
@@ -1062,7 +1062,7 @@ class Util {
public function getMigrationStatus() {
$sql = 'SELECT
- migrationStatus
+ migration_status
FROM
`*PREFIX*encryption`
WHERE
@@ -1078,7 +1078,7 @@ class Util {
while( $row = $result->fetchRow() ) {
- $migrationStatus[] = $row['migrationStatus'];
+ $migrationStatus[] = $row['migration_status'];
}