sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4404 from Ardinis/master 

Remove json handling for files_external:config
pull/4418/head
Morris Jobke 2017-04-20 17:59:35 +07:00 committed by GitHub
parent b99d2b78bd 71118214f9
commit 8a743e0359
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/files_external/lib/Command/Config.php
Unescape Escape View File

@ -91,9 +91,9 @@ class Config extends Base {
} else {
$value = $mount->getBackendOption($key);
}
if (!is_string($value)) { // show bools and objects correctly
$value = json_encode($value);
}
if (!is_string($value) && json_decode(json_encode($value)) === $value) { // show bools and objects correctly
$value = json_encode($value);
}
$output->writeln($value);
}
@ -105,9 +105,9 @@ class Config extends Base {
*/
protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) {
$decoded = json_decode($value, true);
if (!is_null($decoded)) {
$value = $decoded;
}
if (!is_null($decoded) && json_encode($decoded) === $value) {
$value = $decoded;
}
if ($key === 'mountpoint' || $key === 'mount_point') {
$mount->setMountPoint($value);
} else {