summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-10-24 13:53:17 +0200
committerGitHub <noreply@github.com>2017-10-24 13:53:17 +0200
commit3eaf23f29f67dbb6077121cc24beaddd8d587504 (patch)
tree738ba69ef08701f9917206dc101b967035fa17c2 /apps
parent18601903052e389d7dbc25ff2603eb7091415ca0 (diff)
parentf884e762bcf3e1737f1cdd5a4453ca0664087b61 (diff)
downloadnextcloud-server-3eaf23f29f67dbb6077121cc24beaddd8d587504.tar.gz
nextcloud-server-3eaf23f29f67dbb6077121cc24beaddd8d587504.zip
Merge pull request #6920 from nextcloud/appmanager-usage
Use appmanager instead of OC_App for check for enabled app
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/tests/UpdaterTest.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_sharing/tests/UpdaterTest.php b/apps/files_sharing/tests/UpdaterTest.php
index 63000152b5a..c01365a500a 100644
--- a/apps/files_sharing/tests/UpdaterTest.php
+++ b/apps/files_sharing/tests/UpdaterTest.php
@@ -70,7 +70,7 @@ class UpdaterTest extends TestCase {
* that the mount point doesn't end up at the trash bin
*/
public function testDeleteParentFolder() {
- $status = \OC_App::isEnabled('files_trashbin');
+ $status = \OC::$server->getAppManager()->isEnabledForUser('files_trashbin');
(new \OC_App())->enable('files_trashbin');