Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/files_encryption/appinfo/database.xml5
-rw-r--r--lib/private/db/mdb2schemareader.php5
2 files changed, 4 insertions, 6 deletions
diff --git a/apps/files_encryption/appinfo/database.xml b/apps/files_encryption/appinfo/database.xml
index 4587930da0a..099534e3242 100644
--- a/apps/files_encryption/appinfo/database.xml
+++ b/apps/files_encryption/appinfo/database.xml
@@ -18,22 +18,19 @@
<type>text</type>
<notnull>true</notnull>
<length>64</length>
- <comments>What client-side / server-side configuration is used</comments>
</field>
<field>
<name>recovery_enabled</name>
<type>integer</type>
<notnull>true</notnull>
<default>0</default>
- <comments>Whether encryption key recovery is enabled</comments>
</field>
<field>
<name>migration_status</name>
<type>integer</type>
<notnull>true</notnull>
<default>0</default>
- <comments>Whether encryption migration has been performed</comments>
</field>
</declaration>
</table>
-</database> \ No newline at end of file
+</database>
diff --git a/lib/private/db/mdb2schemareader.php b/lib/private/db/mdb2schemareader.php
index 511bd1c90bd..fef24adad98 100644
--- a/lib/private/db/mdb2schemareader.php
+++ b/lib/private/db/mdb2schemareader.php
@@ -176,8 +176,9 @@ class MDB2SchemaReader {
$options['default'] = $default;
break;
case 'comments':
- $comment = (string)$child;
- $options['comment'] = $comment;
+ //FIXME for now we ignore comments https://github.com/doctrine/dbal/pull/407
+ //$comment = (string)$child;
+ //$options['comment'] = $comment;
break;
case 'primary':
$primary = $this->asBool($child);