Mercurial > hg > isophonics-drupal-site
diff core/modules/update/update.install @ 12:7a779792577d
Update Drupal core to v8.4.5 (via Composer)
author | Chris Cannam |
---|---|
date | Fri, 23 Feb 2018 15:52:07 +0000 |
parents | 4c8ae668cc8c |
children | 129ea1e6d783 |
line wrap: on
line diff
--- a/core/modules/update/update.install Fri Feb 23 15:51:18 2018 +0000 +++ b/core/modules/update/update.install Fri Feb 23 15:52:07 2018 +0000 @@ -108,15 +108,17 @@ if ($status != UPDATE_CURRENT) { $requirement['reason'] = $status; $requirement['severity'] = REQUIREMENT_ERROR; - // Append the available updates link to the message from - // _update_message_text(), and format the two translated strings together in - // a single paragraph. + // When updates are available, append the available updates link to the + // message from _update_message_text(), and format the two translated + // strings together in a single paragraph. $requirement['description'][] = ['#markup' => _update_message_text($type, $status)]; - if (_update_manager_access()) { - $requirement['description'][] = ['#prefix' => ' ', '#markup' => t('See the <a href=":available_updates">available updates</a> page for more information and to install your missing updates.', [':available_updates' => \Drupal::url('update.report_update')])]; - } - else { - $requirement['description'][] = ['#prefix' => ' ', '#markup' => t('See the <a href=":available_updates">available updates</a> page for more information.', [':available_updates' => \Drupal::url('update.status')])]; + if (!in_array($status, [UPDATE_UNKNOWN, UPDATE_NOT_CHECKED, UPDATE_NOT_FETCHED, UPDATE_FETCH_PENDING])) { + if (_update_manager_access()) { + $requirement['description'][] = ['#prefix' => ' ', '#markup' => t('See the <a href=":available_updates">available updates</a> page for more information and to install your missing updates.', [':available_updates' => \Drupal::url('update.report_update')])]; + } + else { + $requirement['description'][] = ['#prefix' => ' ', '#markup' => t('See the <a href=":available_updates">available updates</a> page for more information.', [':available_updates' => \Drupal::url('update.status')])]; + } } } switch ($status) { @@ -136,6 +138,7 @@ case UPDATE_UNKNOWN: case UPDATE_NOT_CHECKED: case UPDATE_NOT_FETCHED: + case UPDATE_FETCH_PENDING: $requirement_label = isset($project['reason']) ? $project['reason'] : t('Can not determine status'); $requirement['severity'] = REQUIREMENT_WARNING; break;