summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files_trashbin')
-rw-r--r--apps/files_trashbin/appinfo/app.php1
-rw-r--r--apps/files_trashbin/index.php8
2 files changed, 6 insertions, 3 deletions
diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php
index a045b1f0f51..219c5d6cb7e 100644
--- a/apps/files_trashbin/appinfo/app.php
+++ b/apps/files_trashbin/appinfo/app.php
@@ -6,6 +6,7 @@ $l = OC_L10N::get('files_trashbin');
\OCA\Files\App::getNavigationManager()->add(
array(
+ "id" => 'trashbin',
"appname" => 'files_trashbin',
"script" => 'index.php',
"order" => 1,
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index 59258a6cf16..4c5527822fb 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -3,12 +3,14 @@
// Check if we are a user
OCP\User::checkLoggedIn();
-OCP\Util::addScript('files_trashbin', 'disableDefaultActions');
$tmpl = new OCP\Template('files_trashbin', 'index', '');
-
+// TODO: re-enable after making sure the scripts doesn't
+// override the files app
+/*
+OCP\Util::addScript('files_trashbin', 'disableDefaultActions');
OCP\Util::addStyle('files_trashbin', 'trash');
OCP\Util::addScript('files_trashbin', 'filelist');
OCP\Util::addScript('files_trashbin', 'trash');
-
+ */
$tmpl->printPage();