diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-08 13:36:11 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-08 13:36:11 +0100 |
| commit | 0f5132552c7cab120fb31f7929b754e25ddaef7a (patch) | |
| tree | a1d27bc002653c20ac0e252331e9a4b5f17dcb31 /lib | |
| parent | 5380215dca98b4afb49fa919c61fee047c804f33 (diff) | |
| parent | 2f98f642415a041fa0c9820cda022f18c781a9e6 (diff) | |
| download | nextcloud-server-0f5132552c7cab120fb31f7929b754e25ddaef7a.tar.gz nextcloud-server-0f5132552c7cab120fb31f7929b754e25ddaef7a.zip | |
Merge pull request #21292 from owncloud/checkAppEnabled-not-needed-anymore
core will handle invalid URLs and redirects properly
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/util.php | 14 | ||||
| -rw-r--r-- | lib/public/app.php | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/lib/private/util.php b/lib/private/util.php index 6a9980fc129..33521429be7 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -965,20 +965,6 @@ class OC_Util { OC_Template::printGuestPage("", "login", $parameters); } - - /** - * Check if the app is enabled, redirects to home if not - * - * @param string $app - * @return void - */ - public static function checkAppEnabled($app) { - if (!OC_App::isEnabled($app)) { - header('Location: ' . \OCP\Util::linkToAbsolute('', 'index.php')); - exit(); - } - } - /** * Check if the user is logged in, redirects to home if not. With * redirect URL parameter to the request URI. diff --git a/lib/public/app.php b/lib/public/app.php index cc414842628..c75a69f0c3d 100644 --- a/lib/public/app.php +++ b/lib/public/app.php @@ -136,9 +136,9 @@ class App { * @param string $app * @return void * @since 4.0.0 + * @deprecated 9.0.0 ownCloud core will handle disabled apps and redirects to valid URLs */ public static function checkAppEnabled( $app ) { - \OC_Util::checkAppEnabled( $app ); } /** |