diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-25 09:52:12 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-25 09:52:12 +0200 |
| commit | db39fede97dc4d6b9a5caf739cb2c03b4dbdd21d (patch) | |
| tree | 0d8c9f25deb067ce23e901c72f2af842e9002341 /apps/files/ajax/rawlist.php | |
| parent | 843f15f3489856b518a30de4c803740844232209 (diff) | |
| parent | 2d12e52769a30ba37d5760b1194f613bcc71035b (diff) | |
| download | nextcloud-server-db39fede97dc4d6b9a5caf739cb2c03b4dbdd21d.tar.gz nextcloud-server-db39fede97dc4d6b9a5caf739cb2c03b4dbdd21d.zip | |
Merge branch 'master' into appframework-master
Conflicts:
apps/files/lib/helper.php
apps/files_trashbin/lib/helper.php
Diffstat (limited to 'apps/files/ajax/rawlist.php')
| -rw-r--r-- | apps/files/ajax/rawlist.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/files/ajax/rawlist.php b/apps/files/ajax/rawlist.php index 802a3083533..531481a84c0 100644 --- a/apps/files/ajax/rawlist.php +++ b/apps/files/ajax/rawlist.php @@ -28,7 +28,7 @@ if($mimetypes && !in_array('httpd/unix-directory', $mimetypes)) { $file['directory'] = $dir; $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; } } @@ -39,7 +39,7 @@ if (is_array($mimetypes) && count($mimetypes)) { $file['directory'] = $dir; $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; } } @@ -48,7 +48,7 @@ if (is_array($mimetypes) && count($mimetypes)) { $file['directory'] = $dir; $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; } } |