diff options
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Installer.php | 3 | ||||
| -rw-r--r-- | lib/private/legacy/app.php | 13 |
2 files changed, 3 insertions, 13 deletions
diff --git a/lib/private/Installer.php b/lib/private/Installer.php index 6a78ea329cc..ad2dcb60f20 100644 --- a/lib/private/Installer.php +++ b/lib/private/Installer.php @@ -471,6 +471,9 @@ class Installer { */ public function removeApp($appId) { if($this->isDownloaded( $appId )) { + if (\OC::$server->getAppManager()->isShipped($appId)) { + return false; + } $appDir = OC_App::getInstallPath() . '/' . $appId; OC_Helper::rmdirr($appDir); return true; diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index e3da5f350a5..b19d63f560e 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -420,19 +420,6 @@ class OC_App { } /** - * @param string $app - * @return bool - */ - public static function removeApp($app) { - if (\OC::$server->getAppManager()->isShipped($app)) { - return false; - } - - $installer = \OC::$server->query(Installer::class); - return $installer->removeApp($app); - } - - /** * This function set an app as disabled in appconfig. * * @param string $app app |