diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-21 11:54:06 -0700 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-21 11:54:06 -0700 |
| commit | 2a0c51a8bf5f8f4f6472e61a1ad6e0dd2f96bf78 (patch) | |
| tree | efe1466fed03cd101b5cae9d1cb9bc25e8d30a95 /apps/files_trashbin | |
| parent | 5b95e7aa0f0487d7ddb07588c71d25cd973c2bb6 (diff) | |
| parent | 4b3e56bcf9a040db67a1ec3cc9bddda751a79bdb (diff) | |
| download | nextcloud-server-2a0c51a8bf5f8f4f6472e61a1ad6e0dd2f96bf78.tar.gz nextcloud-server-2a0c51a8bf5f8f4f6472e61a1ad6e0dd2f96bf78.zip | |
Merge pull request #4927 from owncloud/fix_namespaces_and_autoloading
namespaces use upcasefirst parts
Diffstat (limited to 'apps/files_trashbin')
| -rw-r--r-- | apps/files_trashbin/ajax/list.php | 4 | ||||
| -rw-r--r-- | apps/files_trashbin/appinfo/app.php | 4 | ||||
| -rw-r--r-- | apps/files_trashbin/index.php | 4 | ||||
| -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 |
5 files changed, 9 insertions, 9 deletions
diff --git a/apps/files_trashbin/ajax/list.php b/apps/files_trashbin/ajax/list.php index e72e67b01d7..c9dc13b7840 100644 --- a/apps/files_trashbin/ajax/list.php +++ b/apps/files_trashbin/ajax/list.php @@ -15,7 +15,7 @@ $data = array(); // Make breadcrumb if($doBreadcrumb) { - $breadcrumb = \OCA\files_trashbin\lib\Helper::makeBreadcrumb($dir); + $breadcrumb = \OCA\Files_Trashbin\Helper::makeBreadcrumb($dir); $breadcrumbNav = new OCP\Template('files_trashbin', 'part.breadcrumb', ''); $breadcrumbNav->assign('breadcrumb', $breadcrumb, false); @@ -26,7 +26,7 @@ if($doBreadcrumb) { } // make filelist -$files = \OCA\files_trashbin\lib\Helper::getTrashFiles($dir); +$files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir); if ($files === null){ header("HTTP/1.0 404 Not Found"); diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php index 2c101f0a723..d30a601ef56 100644 --- a/apps/files_trashbin/appinfo/app.php +++ b/apps/files_trashbin/appinfo/app.php @@ -1,7 +1,7 @@ <?php -OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'files_trashbin/lib/hooks.php'; -OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'files_trashbin/lib/trash.php'; +//OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'files_trashbin/lib/hooks.php'; +//OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'files_trashbin/lib/trash.php'; // register hooks \OCA\Files_Trashbin\Trashbin::registerHooks(); diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index 9f17448a757..d8661e170a5 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -36,7 +36,7 @@ if ($isIE8 && isset($_GET['dir'])){ $ajaxLoad = false; if (!$isIE8){ - $files = \OCA\files_trashbin\lib\Helper::getTrashFiles($dir); + $files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir); } else{ $files = array(); @@ -54,7 +54,7 @@ if ($dir && $dir !== '/') { $dirlisting = true; } -$breadcrumb = \OCA\files_trashbin\lib\Helper::makeBreadcrumb($dir); +$breadcrumb = \OCA\Files_Trashbin\Helper::makeBreadcrumb($dir); $breadcrumbNav = new OCP\Template('files_trashbin', 'part.breadcrumb', ''); $breadcrumbNav->assign('breadcrumb', $breadcrumb); diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php index 098fc0b54b7..99f534565f9 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'] = \OCP\Preview::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 |