From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed, 25 Sep 2013 07:52:12 +0000 (+0200)
Subject: Merge branch 'master' into appframework-master
X-Git-Tag: v6.0.0alpha2~121^2~11
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=db39fede97dc4d6b9a5caf739cb2c03b4dbdd21d;p=nextcloud-server.git

Merge branch 'master' into appframework-master

Conflicts:
	apps/files/lib/helper.php
	apps/files_trashbin/lib/helper.php
---

db39fede97dc4d6b9a5caf739cb2c03b4dbdd21d
diff --cc apps/files/ajax/rawlist.php
index 802a3083533,5ca0d5e8117..531481a84c0
--- a/apps/files/ajax/rawlist.php
+++ b/apps/files/ajax/rawlist.php
@@@ -26,9 -26,9 +26,9 @@@ $files = array()
  if($mimetypes && !in_array('httpd/unix-directory', $mimetypes)) {
  	foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, 'httpd/unix-directory' ) as $file ) {
  		$file['directory'] = $dir;
 -		$file['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($file['mimetype']);
 +		$file['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($file['mimetype']);
  		$file["date"] = OCP\Util::formatDate($file["mtime"]);
- 		$file['mimetype_icon'] = \OCA\files\lib\Helper::determineIcon($file);
+ 		$file['mimetype_icon'] = \OCA\Files\Helper::determineIcon($file);
  		$files[] = $file;
  	}
  }
@@@ -37,18 -37,18 +37,18 @@@ if (is_array($mimetypes) && count($mime
  	foreach ($mimetypes as $mimetype) {
  		foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, $mimetype ) as $file ) {
  			$file['directory'] = $dir;
 -			$file['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($file['mimetype']);
 +			$file['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($file['mimetype']);
  			$file["date"] = OCP\Util::formatDate($file["mtime"]);
- 			$file['mimetype_icon'] = \OCA\files\lib\Helper::determineIcon($file);
+ 			$file['mimetype_icon'] = \OCA\Files\Helper::determineIcon($file);
  			$files[] = $file;
  		}
  	}
  } else {
  	foreach( \OC\Files\Filesystem::getDirectoryContent( $dir ) as $file ) {
  		$file['directory'] = $dir;
 -		$file['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($file['mimetype']);
 +		$file['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($file['mimetype']);
  		$file["date"] = OCP\Util::formatDate($file["mtime"]);
- 		$file['mimetype_icon'] = \OCA\files\lib\Helper::determineIcon($file);
+ 		$file['mimetype_icon'] = \OCA\Files\Helper::determineIcon($file);
  		$files[] = $file;
  	}
  }
diff --cc apps/files/lib/helper.php
index f0d3560b878,1d431df04f1..709d78a4d45
--- a/apps/files/lib/helper.php
+++ b/apps/files/lib/helper.php
@@@ -84,8 -84,8 +84,8 @@@ class Helpe
  				}
  			}
  			$i['directory'] = $dir;
 -			$i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($i['mimetype']);
 +			$i['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($i['mimetype']);
- 			$i['icon'] = \OCA\files\lib\Helper::determineIcon($i);
+ 			$i['icon'] = \OCA\Files\Helper::determineIcon($i);
  			$files[] = $i;
  		}
  
diff --cc apps/files_trashbin/lib/helper.php
index 4cb5e8a3902,99f534565f9..4f442ee9304
--- a/apps/files_trashbin/lib/helper.php
+++ b/apps/files_trashbin/lib/helper.php
@@@ -61,8 -61,8 +61,8 @@@ class Helpe
  				$i['directory'] = '';
  			}
  			$i['permissions'] = \OCP\PERMISSION_READ;
 -			$i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($r['mime']);
 +			$i['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($r['mime']);
- 			$i['icon'] = \OCA\files\lib\Helper::determineIcon($i);
+ 			$i['icon'] = \OCA\Files\Helper::determineIcon($i);
  			$files[] = $i;
  		}