summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2009-11-21 16:20:34 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2009-11-21 16:20:34 +0000
commit030963e095dfb0a72542a4fc08d53d1767d0e158 (patch)
treecf43779ad0c7a6472a613e6a2b5683badc60561b
parenta03cfb9f32212b6cb462069c676f8a2c1f969ee6 (diff)
downloadbrdo-030963e095dfb0a72542a4fc08d53d1767d0e158.tar.gz
brdo-030963e095dfb0a72542a4fc08d53d1767d0e158.tar.bz2
#634440 follow-up by justinrandell: Fixed enabling/uninstalling modules.
-rw-r--r--modules/system/system.admin.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index a8027d575..374170357 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -925,7 +925,7 @@ function system_modules_submit($form, &$form_state) {
include_once DRUPAL_ROOT . '/includes/install.inc';
$modules = array();
// If we're not coming from the confirmation form, build the list of modules.
- if (!isset($form_state['storage'])) {
+ if (!isset($form_state['storage']['modules'])) {
foreach ($form_state['values']['modules'] as $group_name => $group) {
foreach ($group as $module => $enabled) {
$modules[$module] = array('group' => $group_name, 'enabled' => $enabled['enable']);
@@ -1146,7 +1146,7 @@ function system_modules_uninstall($form, $form_state = NULL) {
*/
function system_modules_uninstall_confirm_form($storage) {
// Nothing to build.
- if (!isset($storage)) {
+ if (!isset($storage, $storage['uninstall'])) {
return;
}