diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2015-07-08 19:09:10 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2015-07-10 10:17:49 +0200 |
| commit | 032ffc969eeed452091646e35c31003297186b41 (patch) | |
| tree | 2a22783ae512a2fe00b33e5d992c0da001f9ae04 /core/command | |
| parent | 87f3500fda04f76d97754185a71f285e9770c66c (diff) | |
| download | nextcloud-server-032ffc969eeed452091646e35c31003297186b41.tar.gz nextcloud-server-032ffc969eeed452091646e35c31003297186b41.zip | |
Move mimetypealiases.json to mimetypealiases.dist.json
Diffstat (limited to 'core/command')
| -rw-r--r-- | core/command/maintenance/mimetypesjs.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/command/maintenance/mimetypesjs.php b/core/command/maintenance/mimetypesjs.php index 95a4bcd891a..8b01f0acf79 100644 --- a/core/command/maintenance/mimetypesjs.php +++ b/core/command/maintenance/mimetypesjs.php @@ -33,7 +33,12 @@ class MimeTypesJS extends Command { protected function execute(InputInterface $input, OutputInterface $output) { // Fetch all the aliases - $aliases = json_decode(file_get_contents(dirname(__DIR__) . '/../../config/mimetypealiases.json'), true); + $aliases = json_decode(file_get_contents(\OC::$SERVERROOT . '/config/mimetypealiases.dist.json'), true); + + if (file_exists(\OC::$SERVERROOT . '/config/mimetypealiases.json')) { + $custom = get_object_vars(json_decode(file_get_contents(\OC::$SERVERROOT . '/config/mimetypealiases.json'))); + $aliases = array_merge($aliases, $custom); + } // Remove comments $keys = array_filter(array_keys($aliases), function($k) { |