X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fsystem%2Fsrc%2FForm%2FModulesUninstallForm.php;h=841a741e44dbf638aa0ab7ea5e6daeba5ab48dcf;hb=4f1b9b4ab48a8498afac9e2213a02a23ccf4a06c;hp=7949067925d849b1f88b644a771bfcb010a125c1;hpb=af6d1fb995500ae68849458ee10d66abbdcfb252;p=yaffs-website diff --git a/web/core/modules/system/src/Form/ModulesUninstallForm.php b/web/core/modules/system/src/Form/ModulesUninstallForm.php index 794906792..841a741e4 100644 --- a/web/core/modules/system/src/Form/ModulesUninstallForm.php +++ b/web/core/modules/system/src/Form/ModulesUninstallForm.php @@ -116,8 +116,6 @@ class ModulesUninstallForm extends FormBase { return $form; } - $profile = drupal_get_profile(); - // Sort all modules by their name. uasort($uninstallable, 'system_sort_modules_by_info_name'); $validation_reasons = $this->moduleInstaller->validateUninstall(array_keys($uninstallable)); @@ -142,10 +140,9 @@ class ModulesUninstallForm extends FormBase { $form['uninstall'][$module->getName()]['#disabled'] = TRUE; } // All modules which depend on this one must be uninstalled first, before - // we can allow this module to be uninstalled. (The installation profile - // is excluded from this list.) + // we can allow this module to be uninstalled. foreach (array_keys($module->required_by) as $dependent) { - if ($dependent != $profile && drupal_get_installed_schema_version($dependent) != SCHEMA_UNINSTALLED) { + if (drupal_get_installed_schema_version($dependent) != SCHEMA_UNINSTALLED) { $name = isset($modules[$dependent]->info['name']) ? $modules[$dependent]->info['name'] : $dependent; $form['modules'][$module->getName()]['#required_by'][] = $name; $form['uninstall'][$module->getName()]['#disabled'] = TRUE;