diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-12-12 13:16:49 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-12-12 13:16:49 +0100 |
| commit | 6b4502adebf1d756707e8fb5b8ab697c1c746e6b (patch) | |
| tree | 677d8be548307654b28bd2355e6d1282baccf380 /apps | |
| parent | 4f92e4a233a4235cddf7260818fbdf09f67aec49 (diff) | |
| parent | 5eaa2214b87d507bd307f6d446829f119e4fecde (diff) | |
| download | nextcloud-server-6b4502adebf1d756707e8fb5b8ab697c1c746e6b.tar.gz nextcloud-server-6b4502adebf1d756707e8fb5b8ab697c1c746e6b.zip | |
Merge pull request #12812 from owncloud/remove-53-workaround
Remove conditional check for 5.3 compatibility
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_external/lib/config.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index b4ab8b70f33..5742b8f47e2 100644 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -644,12 +644,7 @@ class OC_Mount_Config { $datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT . '/data/'); $file = \OC_Config::getValue('mount_file', $datadir . '/mount.json'); } - $options = 0; - if (defined('JSON_PRETTY_PRINT')) { - // only for PHP >= 5.4 - $options = JSON_PRETTY_PRINT; - } - $content = json_encode($data, $options); + $content = json_encode($data, JSON_PRETTY_PRINT); @file_put_contents($file, $content); @chmod($file, 0640); } |