diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-09-24 23:55:21 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-09-24 23:55:21 +0200 |
| commit | dbf81c89b68f5e999eb16b65588cc110cc9a4f17 (patch) | |
| tree | 9e83a2189d14f54b29530c72edab8f3d65220267 | |
| parent | fe28c9a78cce46502ef4b9b1f052b03c9c37879f (diff) | |
| parent | cb002c1f6b6caa27c90350a6f41afeb60c8f1b8f (diff) | |
| download | nextcloud-server-dbf81c89b68f5e999eb16b65588cc110cc9a4f17.tar.gz nextcloud-server-dbf81c89b68f5e999eb16b65588cc110cc9a4f17.zip | |
Merge pull request #11286 from owncloud/clarify-possible-formats
Clarify possible preview providers for type Office
| -rwxr-xr-x | config/config.sample.php | 6 | ||||
| -rwxr-xr-x | lib/private/preview.php | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 8d9bb975662..cd02cf096d0 100755 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -294,7 +294,11 @@ $CONFIG = array( * - OC\Preview\MarkDown * * The following providers are disabled by default due to performance or privacy concerns: - * - OC\Preview\Office + * - OC\Preview\MSOfficeDoc + * - OC\Preview\MSOffice2003 + * - OC\Preview\MSOffice2007 + * - OC\Preview\OpenDocument + * - OC\Preview\StarOffice * - OC\Preview\SVG * - OC\Preview\Movies * - OC\Preview\PDF diff --git a/lib/private/preview.php b/lib/private/preview.php index 9d44d00e686..c93f5d5516f 100755 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -683,8 +683,12 @@ class Preview { * - OC\Preview\MarkDown * * The following providers are disabled by default due to performance or privacy concerns: - * - OC\Preview\Office - * - OC\Preview\SVG + * - OC\Preview\MSOfficeDoc + * - OC\Preview\MSOffice2003 + * - OC\Preview\MSOffice2007 + * - OC\Preview\OpenDocument + * - OC\Preview\StarOffice + * - OC\Preview\SVG * - OC\Preview\Movies * - OC\Preview\PDF * - OC\Preview\Tiff |