Commit 40af7785 authored by Dries's avatar Dries

- Patch #877690 by catch, das-peter, mfer, Damien Tournoud: cannot upgrade...

- Patch #877690 by catch, das-peter, mfer, Damien Tournoud: cannot upgrade Drupal core if the comment module is enabled.
parent 9442cbbf
......@@ -90,7 +90,7 @@ function comment_update_dependencies() {
);
// Comment update 7012 creates the comment body field and therefore must run
// after all entities have been updated.
// after text module has been enabled and entities have been updated.
$dependencies['comment'][7012] = array(
'system' => 7021,
);
......
......@@ -416,15 +416,6 @@ function system_requirements($phase) {
);
continue;
}
// Check for a disabled dependency.
if (!$required_file->status) {
$requirements["$module-$required_module"] = array(
'title' => $t('Unresolved dependency'),
'description' => $t('@name requires this module.', array('@name' => $name)),
'value' => $t('@required_name (Disabled)', array('@required_name' => $required_name)),
'severity' => REQUIREMENT_ERROR,
);
}
}
}
}
......
......@@ -1716,31 +1716,6 @@ class UpdateScriptFunctionalTest extends DrupalWebTestCase {
$this->assertResponse(200);
}
/**
* Tests the detection of requirements for the update script to proceed.
*/
function testUpdateRequirements() {
$this->drupalLogin($this->update_user);
$this->drupalGet($this->update_url, array('external' => TRUE));
$this->assertResponse(200);
// Test if disabling a module that another enabled module depends on will
// prevent the update from proceeding.
module_disable(array('block'), FALSE);
$this->assertFalse(module_exists('block'), t('Block module is disabled.'));
$this->assertTrue(module_exists('dashboard'), t('Dashboard module is enabled.'));
$this->drupalGet($this->update_url, array('external' => TRUE));
$this->assertText(t('Unresolved dependency'), t('The update process cannot proceed when a module dependency is not enabled.'));
// Test if modules required by the current install profile are not required
// to be enabled for an update to proceed.
module_enable(array('block'));
$this->assertTrue(module_exists('block'), t('Block module is enabled.'));
module_disable(array('overlay'));
$this->assertFalse(module_exists('overlay'), t('Overlay module is disabled.'));
$this->drupalGet($this->update_url, array('external' => TRUE));
$this->assertNoText(t('Unresolved dependency'), t('The update process can proceed when modules from the install profile are disabled.'));
}
/**
* Tests the effect of using the update script on the theme system.
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment