sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5833 from nextcloud/fix_uninstall_rep_step 

Run repair steps on uninstall in all cases
pull/8112/head
Morris Jobke 2018-03-06 17:57:10 +07:00 committed by GitHub
parent d0de8e4905 b2a9ea08a3
commit 846b0d6a42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_sharing/tests/UpdaterTest.php
Unescape Escape 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
Unescape Escape 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
Unescape Escape 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();

7
lib/private/App/AppManager.php
Unescape Escape View File

@ -287,6 +287,13 @@ class AppManager implements IAppManager {
}
unset($this->installedAppsCache[$appId]);
$this->appConfig->setValue($appId, 'enabled', 'no');
// run uninstall steps
$appData = $this->getAppInfo($appId);
if (!is_null($appData)) {
\OC_App::executeRepairSteps($appId, $appData['repair-steps']['uninstall']);
}
$this->dispatcher->dispatch(ManagerEvent::EVENT_APP_DISABLE, new ManagerEvent(
ManagerEvent::EVENT_APP_DISABLE, $appId
));

2
lib/private/Updater.php
Unescape Escape 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

39
lib/private/legacy/app.php
Unescape Escape View File

@ -154,16 +154,9 @@ 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'))) {
// since authentication apps affect the "is app enabled for group" check,
// the enabled apps cache needs to be cleared to make sure that the
// next time getEnableApps() is called it will also include apps that were
// enabled for groups
self::$enabledAppsCache = [];
}
\OC::$server->getEventLogger()->end('load_app_' . $app);
}
@ -329,11 +322,6 @@ class OC_App {
}
}
/**
* get all enabled apps
*/
protected static $enabledAppsCache = [];
/**
* Returns apps enabled for the current user.
*
@ -393,7 +381,6 @@ class OC_App {
*/
public function enable(string $appId,
array $groups = []) {
self::$enabledAppsCache = []; // flush
// Check if app is already downloaded
$installer = \OC::$server->query(Installer::class);
@ -421,30 +408,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 = [];
// run uninstall steps
$appData = OC_App::getAppInfo($app);
if (!is_null($appData)) {
OC_App::executeRepairSteps($app, $appData['repair-steps']['uninstall']);
}
// emit disable hook - needed anymore ?
\OC_Hook::emit('OC_App', 'pre_disable', array('app' => $app));
// finally disable it
$appManager = \OC::$server->getAppManager();
$appManager->disableApp($app);
}
/**
* Get the path where to install apps
*

2
settings/ajax/disableapp.php
Unescape Escape View File

@ -39,6 +39,6 @@ if (!array_key_exists('appid', $_POST)) {
$appIds = (array)$_POST['appid'];
foreach($appIds as $appId) {
$appId = OC_App::cleanAppId($appId);
OC_App::disable($appId);
\OC::$server->getAppManager()->disableApp($appId);
}
OC_JSON::success();