diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-10-24 13:53:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-24 13:53:17 +0200 |
| commit | 3eaf23f29f67dbb6077121cc24beaddd8d587504 (patch) | |
| tree | 738ba69ef08701f9917206dc101b967035fa17c2 /lib | |
| parent | 18601903052e389d7dbc25ff2603eb7091415ca0 (diff) | |
| parent | f884e762bcf3e1737f1cdd5a4453ca0664087b61 (diff) | |
| download | nextcloud-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 'lib')
| -rw-r--r-- | lib/private/legacy/app.php | 2 | ||||
| -rw-r--r-- | lib/private/legacy/json.php | 2 | ||||
| -rw-r--r-- | lib/private/legacy/template.php | 2 | ||||
| -rw-r--r-- | lib/public/App.php | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index bd261b05e51..9b25810ca98 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -1159,7 +1159,7 @@ class OC_App { * @return \OC\Files\View|false */ public static function getStorage($appId) { - if (OC_App::isEnabled($appId)) { //sanity check + if (\OC::$server->getAppManager()->isEnabledForUser($appId)) { //sanity check if (\OC::$server->getUserSession()->isLoggedIn()) { $view = new \OC\Files\View('/' . OC_User::getUser()); if (!$view->file_exists($appId)) { diff --git a/lib/private/legacy/json.php b/lib/private/legacy/json.php index 180dd7c448d..221a0047eb4 100644 --- a/lib/private/legacy/json.php +++ b/lib/private/legacy/json.php @@ -55,7 +55,7 @@ class OC_JSON{ * @suppress PhanDeprecatedFunction */ public static function checkAppEnabled($app) { - if( !OC_App::isEnabled($app)) { + if( !\OC::$server->getAppManager()->isEnabledForUser($app)) { $l = \OC::$server->getL10N('lib'); self::error(array( 'data' => array( 'message' => $l->t('Application is not enabled'), 'error' => 'application_not_enabled' ))); exit(); diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php index 8c6185cd556..55df2dece11 100644 --- a/lib/private/legacy/template.php +++ b/lib/private/legacy/template.php @@ -297,7 +297,7 @@ class OC_Template extends \OC\Template\Base { * @suppress PhanAccessMethodInternal */ public static function printErrorPage( $error_msg, $hint = '' ) { - if (\OC_App::isEnabled('theming') && !\OC_App::isAppLoaded('theming')) { + if (\OC::$server->getAppManager()->isEnabledForUser('theming') && !\OC_App::isAppLoaded('theming')) { \OC_App::loadApp('theming'); } diff --git a/lib/public/App.php b/lib/public/App.php index 06dde22b8d1..250d33bf01f 100644 --- a/lib/public/App.php +++ b/lib/public/App.php @@ -127,9 +127,10 @@ class App { * * This function checks whether or not an app is enabled. * @since 4.0.0 + * @deprecated 13.0.0 use \OC::$server->getAppManager()->isEnabledForUser($appId) */ public static function isEnabled( $app ) { - return \OC_App::isEnabled( $app ); + return \OC::$server->getAppManager()->isEnabledForUser( $app ); } /** |