summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-04-18 22:51:15 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-04-18 22:51:15 +0200
commitcdf82909b8225a885fbf92b78208fb1fe258853e (patch)
tree645bada4dd0189831330e387cffa0b3696348d3f /lib
parentb7a4972218ccaa1f030762783cd41a965095e741 (diff)
parent491e5901652474fdf30fcab5d1deb8e8193dc5de (diff)
downloadnextcloud-server-cdf82909b8225a885fbf92b78208fb1fe258853e.tar.gz
nextcloud-server-cdf82909b8225a885fbf92b78208fb1fe258853e.zip
Merge pull request #15718 from owncloud/issue/15694-display-name-of-encryption-modules
Issue/15694 display name of encryption modules
Diffstat (limited to 'lib')
-rw-r--r--lib/private/encryption/manager.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php
index e01054c92a4..7a3f17519fc 100644
--- a/lib/private/encryption/manager.php
+++ b/lib/private/encryption/manager.php
@@ -106,11 +106,11 @@ class Manager implements IManager {
$this->setDefaultEncryptionModule($id);
}
- $this->encryptionModules[$id] = array(
+ $this->encryptionModules[$id] = [
'id' => $id,
- 'displayName' => 'displayName',
- 'callback' => $callback
- );
+ 'displayName' => $displayName,
+ 'callback' => $callback,
+ ];
}
/**