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_trashbin/lib | |
| 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_trashbin/lib')
| -rw-r--r-- | apps/files_trashbin/lib/helper.php | 6 | ||||
| -rw-r--r-- | apps/files_trashbin/lib/trashbin.php (renamed from apps/files_trashbin/lib/trash.php) | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php index 4cb5e8a3902..4f442ee9304 100644 --- a/apps/files_trashbin/lib/helper.php +++ b/apps/files_trashbin/lib/helper.php @@ -1,6 +1,6 @@ <?php -namespace OCA\files_trashbin\lib; +namespace OCA\Files_Trashbin; class Helper { @@ -62,11 +62,11 @@ class Helper } $i['permissions'] = \OCP\PERMISSION_READ; $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; } - usort($files, array('\OCA\files\lib\Helper', 'fileCmp')); + usort($files, array('\OCA\Files\Helper', 'fileCmp')); return $files; } diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trashbin.php index c79afdc0c2e..c79afdc0c2e 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trashbin.php |