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

Move uninstall repair step execution to the correct place

remotes/origin/move_setupfromtoken_to_sharemanager
Thomas Müller 2016-05-02 09:22:26 +07:00
parent b0211a54c4
commit 5e055ca6c1
No known key found for this signature in database
GPG Key ID: A943788A3BBEC44C
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/private/Installer.php
Unescape Escape View File

@ -493,11 +493,6 @@ class Installer {
*/
public static function removeApp($appId) {
$appData = OC_App::getAppInfo($appId);
if (!is_null($appData)) {
OC_App::executeRepairSteps($appId, $appData['repair-steps']['uninstall']);
}
if(Installer::isDownloaded( $appId )) {
$appDir=OC_App::getInstallPath() . '/' . $appId;
OC_Helper::rmdirr($appDir);

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

@ -370,9 +370,19 @@ class OC_App {
$app = self::getInternalAppIdByOcs($app);
}
self::$enabledAppsCache = array(); // flush
// check if app is a shipped app or not. if not delete
// flush
self::$enabledAppsCache = array();
// 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);
}