opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update core 8.3.0

Browse source
This commit is contained in:
Rob Davies 2017-04-13 15:53:35 +01:00
parent da7a7918f8
commit cd7a898e66
6144 changed files with 132297 additions and 87747 deletions
Download patch file Download diff file Expand all files Collapse all files

12
web/core/authorize.php
View file

@ -116,10 +116,10 @@ if ($is_allowed) {
drupal_set_message($results['page_message']['message'], $results['page_message']['type']);
}
$content['authorize_report'] = array(
$content['authorize_report'] = [
'#theme' => 'authorize_report',
'#messages' => $results['messages'],
);
];
if (is_array($results['tasks'])) {
$links = $results['tasks'];
@ -148,11 +148,11 @@ if ($is_allowed) {
];
}
$content['next_steps'] = array(
$content['next_steps'] = [
'#theme' => 'item_list',
'#items' => $links,
'#title' => t('Next steps'),
);
];
}
// If a batch is running, let it run.
elseif ($request->query->has('batch')) {
@ -189,9 +189,9 @@ else {
}
$bare_html_page_renderer = \Drupal::service('bare_html_page_renderer');
$response = $bare_html_page_renderer->renderBarePage($content, $page_title, 'maintenance_page', array(
$response = $bare_html_page_renderer->renderBarePage($content, $page_title, 'maintenance_page', [
'#show_messages' => $show_messages,
));
]);
if (!$is_allowed) {
$response->setStatusCode(403);
}