diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-12-18 23:01:49 +0100 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-12-18 23:01:49 +0100 |
| commit | 49318b4d93b4dc5fbd58fa87b2efa8f1577fb7b7 (patch) | |
| tree | e5e909e5482f77eb0965f174cf3c32108f0270dd /apps/files_external | |
| parent | 5327b8043019ec8f0cfe19d70794978570bba4bc (diff) | |
| parent | d41082f4d625ae5aa053e6f038fa498517e45ef0 (diff) | |
| download | nextcloud-server-49318b4d93b4dc5fbd58fa87b2efa8f1577fb7b7.tar.gz nextcloud-server-49318b4d93b4dc5fbd58fa87b2efa8f1577fb7b7.zip | |
Merge pull request #12896 from owncloud/drop-deprecated
first step to drop \OCP\Config:: in favour of IConfig
Diffstat (limited to 'apps/files_external')
| -rw-r--r-- | apps/files_external/lib/config.php | 2 | ||||
| -rw-r--r-- | apps/files_external/lib/sftp.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index f09b29a522b..823c0bcbfc1 100644 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -862,7 +862,7 @@ class OC_Mount_Config { include('Crypt/AES.php'); } $cipher = new Crypt_AES(CRYPT_AES_MODE_CBC); - $cipher->setKey(\OCP\Config::getSystemValue('passwordsalt')); + $cipher->setKey(\OC::$server->getConfig()->getSystemValue('passwordsalt', null)); return $cipher; } diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php index f0a6f145422..f6c56669734 100644 --- a/apps/files_external/lib/sftp.php +++ b/apps/files_external/lib/sftp.php @@ -112,7 +112,7 @@ class SFTP extends \OC\Files\Storage\Common { try { $storage_view = \OCP\Files::getStorage('files_external'); if ($storage_view) { - return \OCP\Config::getSystemValue('datadirectory') . + return \OC::$server->getConfig()->getSystemValue('datadirectory') . $storage_view->getAbsolutePath('') . 'ssh_hostKeys'; } |