diff options
| m--------- | 3rdparty | 0 | ||||
| -rw-r--r-- | apps/settings/js/federationsettingsview.js | 4 | ||||
| -rw-r--r-- | core/Application.php | 4 | ||||
| -rw-r--r-- | core/Command/Db/AddMissingIndices.php | 7 | ||||
| -rw-r--r-- | core/Migrations/Version13000Date20170718121200.php | 1 |
5 files changed, 4 insertions, 12 deletions
diff --git a/3rdparty b/3rdparty -Subproject 90a8336c3b51a3be5869569ef8e84949a1e6760 +Subproject fbc872de93b18d3e87367d00e281982eab74c5b diff --git a/apps/settings/js/federationsettingsview.js b/apps/settings/js/federationsettingsview.js index cf7f4648905..bb8011aca73 100644 --- a/apps/settings/js/federationsettingsview.js +++ b/apps/settings/js/federationsettingsview.js @@ -231,6 +231,7 @@ _setFieldScopeIcon: function(field, scope) { var $icon = this.$('#' + field + 'form > h3 .icon-federation-menu'); + $icon.removeClass('icon-phone'); $icon.removeClass('icon-password'); $icon.removeClass('icon-contacts-dark'); $icon.removeClass('icon-link'); @@ -238,6 +239,9 @@ switch (scope) { case 'v2-private': + $icon.addClass('icon-phone'); + $icon.removeClass('hidden'); + break; case 'v2-local': $icon.addClass('icon-password'); $icon.removeClass('hidden'); diff --git a/core/Application.php b/core/Application.php index 93032e53d42..c3cb6f02ed5 100644 --- a/core/Application.php +++ b/core/Application.php @@ -112,10 +112,6 @@ class Application extends App { if (!$table->hasIndex('fs_size')) { $subject->addHintForMissingSubject($table->getName(), 'fs_size'); } - - if (!$table->hasIndex('fs_path_prefix')) { - $subject->addHintForMissingSubject($table->getName(), 'fs_path_prefix'); - } } if ($schema->hasTable('twofactor_providers')) { diff --git a/core/Command/Db/AddMissingIndices.php b/core/Command/Db/AddMissingIndices.php index a4f59184537..1acff55fa40 100644 --- a/core/Command/Db/AddMissingIndices.php +++ b/core/Command/Db/AddMissingIndices.php @@ -144,13 +144,6 @@ class AddMissingIndices extends Command { $updated = true; $output->writeln('<info>Filecache table updated successfully.</info>'); } - if (!$table->hasIndex('fs_path_prefix')) { - $output->writeln('<info>Adding additional path index to the filecache table, this can take some time...</info>'); - $table->addIndex(['size'], 'fs_path_prefix', [], ["lengths" => [128]]); - $this->connection->migrateToSchema($schema->getWrappedSchema()); - $updated = true; - $output->writeln('<info>Filecache table updated successfully.</info>'); - } } $output->writeln('<info>Check indices of the twofactor_providers table.</info>'); diff --git a/core/Migrations/Version13000Date20170718121200.php b/core/Migrations/Version13000Date20170718121200.php index 2a9636336a6..4912bef8857 100644 --- a/core/Migrations/Version13000Date20170718121200.php +++ b/core/Migrations/Version13000Date20170718121200.php @@ -262,7 +262,6 @@ class Version13000Date20170718121200 extends SimpleMigrationStep { $table->addIndex(['storage', 'size', 'fileid'], 'fs_storage_size'); $table->addIndex(['mtime'], 'fs_mtime'); $table->addIndex(['size'], 'fs_size'); - $table->addIndex(['path'], 'fs_path_prefix', [], ["lengths" => [128]]); } if (!$schema->hasTable('group_user')) { |