Merge branch 'master' into appframework-master

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

diff --cc apps/files/ajax/rawlist.php
index 802a308353360893542fc35e2c5bbbea66bea6c8,5ca0d5e81173edbff5c616393b7029267be7a2aa..531481a84c00e98f46aaeb07ca730d0c91b4568e
--- 1/apps/files/ajax/rawlist.php
--- 2/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 f0d3560b878397506bfc6048a798c29ca207d3a9,1d431df04f15b7d81fdaf77a9db1f41a0da471a2..709d78a4d45cb65aab21c3f8f00613e141337055
--- 1/apps/files/lib/helper.php
--- 2/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_sharing/public.php
Simple merge

diff --cc apps/files_trashbin/lib/helper.php
index 4cb5e8a39022929b40fff2e474e254bd8a1d3ee8,99f534565f943dcae8970eb4b59d00f584b5d74c..4f442ee930471cf39023059c071a79cd53376bf8
--- 1/apps/files_trashbin/lib/helper.php
--- 2/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;
                }
  

diff --cc lib/base.php
Simple merge