diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-11-24 18:14:25 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-11-24 18:14:25 +0000 |
| commit | 47768bfaa5faca5bcc84f0c08f6220007804c994 (patch) | |
| tree | 9b25fe56b329586fef1906ff5fc2de8893937ab8 | |
| parent | a66344453bcb01042abdf4f09f5ca663ec99d80d (diff) | |
| download | brdo-47768bfaa5faca5bcc84f0c08f6220007804c994.tar.gz brdo-47768bfaa5faca5bcc84f0c08f6220007804c994.tar.bz2 | |
#602484 by rschwab: Fix the report page when authorize.php completes an update manager operation.
| -rw-r--r-- | authorize.php | 2 | ||||
| -rw-r--r-- | includes/theme.maintenance.inc | 12 | ||||
| -rw-r--r-- | modules/update/update.authorize.inc | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/authorize.php b/authorize.php index eb9a753a5..e04f14f4a 100644 --- a/authorize.php +++ b/authorize.php @@ -146,7 +146,7 @@ if (authorize_access_allowed()) { l(t('Front page'), '<front>'), )); - $output .= theme('item_list', array('items' => $links)); + $output .= theme('item_list', array('items' => $links, 'title' => t('Next steps'))); } // If a batch is running, let it run. elseif (isset($_GET['batch'])) { diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc index 74987edcf..7cc03126f 100644 --- a/includes/theme.maintenance.inc +++ b/includes/theme.maintenance.inc @@ -176,13 +176,14 @@ function theme_authorize_report($variables) { if (!empty($messages)) { $output .= '<div id="authorize-results">'; foreach ($messages as $heading => $logs) { - $output .= '<h3>' . check_plain($heading) . '</h3>'; + $items = array(); foreach ($logs as $number => $log_message) { if ($number === '#abort') { continue; } - $output .= theme('authorize_message', array('message' => $log_message['message'], 'success' => $log_message['success'])); + $items[] = theme('authorize_message', array('message' => $log_message['message'], 'success' => $log_message['success'])); } + $output .= theme('item_list', array('items' => $items, 'title' => $heading)); } $output .= '</div>'; } @@ -200,14 +201,13 @@ function theme_authorize_report($variables) { * @ingroup themeable */ function theme_authorize_message($variables) { - $output = ''; $message = $variables['message']; $success = $variables['success']; if ($success) { - $output .= '<li class="success">' . $message . '</li>'; + $item = array('data' => $message, 'class' => array('success')); } else { - $output .= '<li class="failure"><strong>' . t('Failed') . ':</strong> ' . $message . '</li>'; + $item = array('data' => '<strong>' . $message . '</strong>', 'class' => array('failure')); } - return $output; + return $item; } diff --git a/modules/update/update.authorize.inc b/modules/update/update.authorize.inc index fbbc31ca7..c1e9c9244 100644 --- a/modules/update/update.authorize.inc +++ b/modules/update/update.authorize.inc @@ -265,6 +265,7 @@ function update_authorize_install_batch_finished($success, $results) { $_SESSION['authorize_results']['page_message'] = $page_message; $_SESSION['authorize_results']['messages'] = $results['log']; $_SESSION['authorize_results']['tasks'] = $results['tasks']; + $_SESSION['authorize_operation']['page_title'] = t('Drupal Update Manager'); } /** |