Commit 17ccb8b1 authored by alexpott's avatar alexpott

Issue #2240021 by BMDan, quartsize: Fixed Improve Installer REQUIREMENT_WARNING Messaging.

parent 6c91ce87
...@@ -2044,12 +2044,16 @@ function install_display_requirements($install_state, $requirements) { ...@@ -2044,12 +2044,16 @@ function install_display_requirements($install_state, $requirements) {
// and indicating a desire to continue anyway. See drupal_requirements_url(). // and indicating a desire to continue anyway. See drupal_requirements_url().
if ($severity == REQUIREMENT_ERROR || ($severity == REQUIREMENT_WARNING && empty($install_state['parameters']['continue']))) { if ($severity == REQUIREMENT_ERROR || ($severity == REQUIREMENT_WARNING && empty($install_state['parameters']['continue']))) {
if ($install_state['interactive']) { if ($install_state['interactive']) {
$build['#title'] = t('Requirements problem'); $build['report']['#theme'] = 'status_report';
$build['report'] = array( $build['report']['#requirements'] = $requirements;
'#theme' => 'status_report', if ($severity == REQUIREMENT_WARNING) {
'#requirements' => $requirements, $build['#title'] = t('Requirements review');
'#suffix' => t('Check the messages and <a href="!url">try again</a>.', array('!url' => check_url(drupal_requirements_url($severity)))), $build['#suffix'] = t('Check the messages and <a href="!retry">retry</a>, or you may choose to <a href="!cont">continue anyway</a>.', array('!retry' => check_url(drupal_requirements_url(REQUIREMENT_ERROR)), '!cont' => check_url(drupal_requirements_url($severity))));
); }
else {
$build['#title'] = t('Requirements problem');
$build['#suffix'] = t('Check the messages and <a href="!url">try again</a>.', array('!url' => check_url(drupal_requirements_url($severity))));
}
return $build; return $build;
} }
else { else {
......
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