[Pkg-owncloud-commits] [owncloud] 19/38: The class name is Movie NOT Movies

[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 45ad072c62d71cef02c0a3dff5a4dc778552d909
Author: Olivier Paroz <github at oparoz.com>
Date:   Fri Nov 21 17:12:11 2014 +0100

    The class name is Movie NOT Movies
    
    Conflicts:
    	config/config.sample.php
    	lib/private/preview.php
---
 config/config.sample.php                      | 2 +-
 lib/private/preview.php                       | 4 ++--
 lib/private/preview/{movies.php => movie.php} | 0
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index f775b3b..3ddf0a6 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -640,7 +640,7 @@ $CONFIG = array(
  * The following providers are disabled by default due to performance or privacy
  * concerns:
  *
- *  - OC\Preview\Movies
+ *  - OC\Preview\Movie
  *  - OC\Preview\MSOffice2003
  *  - OC\Preview\MSOffice2007
  *  - OC\Preview\MSOfficeDoc
diff --git a/lib/private/preview.php b/lib/private/preview.php
index a0f2e81..0cb35c4 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -16,7 +16,7 @@ namespace OC;
 use OC\Preview\Provider;
 
 require_once 'preview/image.php';
-require_once 'preview/movies.php';
+require_once 'preview/movie.php';
 require_once 'preview/mp3.php';
 require_once 'preview/pdf.php';
 require_once 'preview/svg.php';
@@ -707,7 +707,7 @@ class Preview {
 		*  - OC\Preview\OpenDocument
 		*  - OC\Preview\StarOffice
 		*  - OC\Preview\SVG
-		*  - OC\Preview\Movies
+		*  - OC\Preview\Movie
 		*  - OC\Preview\PDF
 		*/
 		if(empty(self::$enabledProviders)) {
diff --git a/lib/private/preview/movies.php b/lib/private/preview/movie.php
similarity index 100%
rename from lib/private/preview/movies.php
rename to lib/private/preview/movie.php

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