mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #17509 from rullzer/mimetype-alias-dist 

Move mimetypealiases.json to mimetypealiases.dist.json
This commit is contained in:
Roeland Douma 2015-07-10 11:44:09 +02:00
parent 87f3500fda 032ffc969e
commit 4806d7597b
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/mimetypealiases.json → config/mimetypealiases.dist.json
View File

@ -1,7 +1,11 @@
{
"_comment" : "When this file is changed make sure to run",
"_comment2": "./occ maintenance:mimetypesjs",
"_comment3": "Otherwise your update won't propagate through the system",
"_comment" : "Array of mimetype aliases.",
"_comment2": "Any changes you make here will be overwritten on an update of ownCloud.",
"_comment3": "Put any custom aliases in a new file mimetypealiases.json in this directory",
"_comment4": "After any change to mimetypealiases.json run:",
"_comment5": "./occ maintenance:mimetypesjs",
"_comment6": "Otherwise your update won't propagate through the system.",
"application/coreldraw": "image",

7
core/command/maintenance/mimetypesjs.php
View File

@ -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) {

7
lib/private/helper.php
View File

@ -188,8 +188,13 @@ class OC_Helper {
// On first access load the list of mimetype aliases
if (empty(self::$mimeTypeAlias)) {
$file = file_get_contents(OC::$SERVERROOT . '/config/mimetypealiases.json');
$file = file_get_contents(OC::$SERVERROOT . '/config/mimetypealiases.dist.json');
self::$mimeTypeAlias = get_object_vars(json_decode($file));
if (file_exists(\OC::$SERVERROOT . '/config/mimetypealiases.json')) {
$custom = get_object_vars(json_decode(file_get_contents(\OC::$SERVERROOT . '/config/mimetypealiases.json')));
self::$mimeTypeAlias = array_merge(self::$mimeTypeAlias, $custom);
}
}
if (isset(self::$mimeTypeAlias[$mimetype])) {