[Pkg-owncloud-commits] [owncloud] 144/258: Clarify possible preview providers for type Office

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 6d8fdcd7d2632b76782651748144a40df5deb088
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Wed Sep 24 21:16:14 2014 +0200

    Clarify possible preview providers for type Office
    
    a
    
    Conflicts:
    	lib/private/preview.php
---
 config/config.sample.php | 6 +++++-
 lib/private/preview.php  | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index c041f4e..987bf2c 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -280,7 +280,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 40b3eb8..6953f63 100755
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -675,7 +675,11 @@ class Preview {
 		*  - 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git