summaryrefslogtreecommitdiffstats
path: root/lib/private/util.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2015-02-18 14:24:50 +0100
committerRobin Appelman <icewind@owncloud.com>2015-02-18 14:24:50 +0100
commit5542fafd3696033ea8bfdcc441c05522cf6a5736 (patch)
tree0a57238a19a66db184e28ca584c78e0145743b8d /lib/private/util.php
parente672f8cc8ff046d847b1a3eaaf9fbc8159fa59f3 (diff)
downloadnextcloud-server-5542fafd3696033ea8bfdcc441c05522cf6a5736.tar.gz
nextcloud-server-5542fafd3696033ea8bfdcc441c05522cf6a5736.zip
allow overwriting the appmanager in oc_util by subclassing
Diffstat (limited to 'lib/private/util.php')
-rw-r--r--lib/private/util.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/private/util.php b/lib/private/util.php
index 2be7e8eb293..b51b7ec51c4 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -11,6 +11,10 @@ class OC_Util {
private static $rootMounted = false;
private static $fsSetup = false;
+ protected static function getAppManager() {
+ return \OC::$server->getAppManager();
+ }
+
private static function initLocalStorageRootFS() {
// mount local file backend as root
$configDataDirectory = OC_Config::getValue("datadirectory", OC::$SERVERROOT . "/data");
@@ -926,7 +930,7 @@ class OC_Util {
// find the first app that is enabled for the current user
foreach ($defaultApps as $defaultApp) {
$defaultApp = OC_App::cleanAppId(strip_tags($defaultApp));
- if (OC_App::isEnabled($defaultApp)) {
+ if (static::getAppManager()->isEnabledForUser($defaultApp)) {
$appId = $defaultApp;
break;
}