mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove OC_App::disable method 

Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
This commit is contained in:
Tobia De Koninck 2018-02-13 08:03:06 +01:00 committed by Morris Jobke
parent 539fdaea1e
commit 55b9a5d886
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
5 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_sharing/tests/UpdaterTest.php
View File

@ -127,7 +127,7 @@ class UpdaterTest extends TestCase {
$rootView->deleteAll('files_trashin');
if ($status === false) {
\OC_App::disable('files_trashbin');
\OC::$server->getAppManager()->disableApp('files_trashbin');
}
\OC\Files\Filesystem::getLoader()->removeStorageWrapper('oc_trashbin');

2
apps/files_trashbin/tests/TrashbinTest.php
View File

@ -71,7 +71,7 @@ class TrashbinTest extends \Test\TestCase {
$application->registerMountProviders();
//disable encryption
\OC_App::disable('encryption');
\OC::$server->getAppManager()->disableApp('encryption');
$config = \OC::$server->getConfig();
//configure trashbin

2
lib/base.php
View File

@ -949,7 +949,7 @@ class OC {
$appIds = (array)$request->getParam('appid');
foreach($appIds as $appId) {
$appId = \OC_App::cleanAppId($appId);
\OC_App::disable($appId);
\OC::$server->getAppManager()->disableApp($appId);
}
\OC_JSON::success();
exit();

2
lib/private/Updater.php
View File

@ -395,7 +395,7 @@ class Updater extends BasicEmitter {
if ($appManager->isShipped($app)) {
throw new \UnexpectedValueException('The files of the app "' . $app . '" were not correctly replaced before running the update');
}
OC_App::disable($app);
\OC::$server->getAppManager()->disableApp($app);
$this->emit('\OC\Updater', 'incompatibleAppDisabled', array($app));
}
// no need to disable any app in case this is a non-core upgrade

16
lib/private/legacy/app.php
View File

@ -154,7 +154,7 @@ class OC_App {
\OC::$server->getLogger()->logException($ex);
if (!\OC::$server->getAppManager()->isShipped($app)) {
// Only disable apps which are not shipped
self::disable($app);
\OC::$server->getAppManager()->disableApp($app);
}
}
if (self::isType($app, array('authentication'))) {
@ -421,20 +421,6 @@ class OC_App {
}
}
/**
* This function set an app as disabled in appconfig.
*
* @param string $app app
* @throws Exception
*/
public static function disable(string $app) {
// flush
self::$enabledAppsCache = [];
$appManager = \OC::$server->getAppManager();
$appManager->disableApp($app);
}
/**
* Get the path where to install apps
*