summaryrefslogtreecommitdiffstats
path: root/lib/private/Installer.php
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2019-12-16 12:34:27 +0100
committerGitHub <noreply@github.com>2019-12-16 12:34:27 +0100
commitfaf58e4cacf6475110e32c7e5c8f37971b641b1a (patch)
tree8d9e184401c781e1b4c95d2b369e17ef0b448f61 /lib/private/Installer.php
parent85ef2bf94429d37ad4c76860b8d9028505b3bf13 (diff)
parent3eee359d7ffd6219f6a2ab8cca18a13118552842 (diff)
downloadnextcloud-server-faf58e4cacf6475110e32c7e5c8f37971b641b1a.tar.gz
nextcloud-server-faf58e4cacf6475110e32c7e5c8f37971b641b1a.zip
Merge pull request #17018 from nextcloud/feature/noid/allow-to-force-enable-via-cli
Allow to force enable apps via CLI
Diffstat (limited to 'lib/private/Installer.php')
-rw-r--r--lib/private/Installer.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/Installer.php b/lib/private/Installer.php
index 2ad1fb36af7..d583dd20761 100644
--- a/lib/private/Installer.php
+++ b/lib/private/Installer.php
@@ -94,10 +94,11 @@ class Installer {
* Installs an app that is located in one of the app folders already
*
* @param string $appId App to install
+ * @param bool $forceEnable
* @throws \Exception
* @return string app ID
*/
- public function installApp($appId) {
+ public function installApp(string $appId, bool $forceEnable = false): string {
$app = \OC_App::findAppInDirectories($appId);
if($app === false) {
throw new \Exception('App not found in any app directory');
@@ -117,7 +118,7 @@ class Installer {
}
$ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
- $ignoreMax = in_array($appId, $ignoreMaxApps);
+ $ignoreMax = $forceEnable || in_array($appId, $ignoreMaxApps, true);
$version = implode('.', \OCP\Util::getVersion());
if (!\OC_App::isAppCompatible($version, $info, $ignoreMax)) {