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

Update Composer, update everything

Browse source
This commit is contained in:
Oliver Davies 2018-11-23 12:29:20 +00:00
parent ea3e94409f
commit dda5c284b6
19527 changed files with 1135420 additions and 351004 deletions
Download patch file Download diff file Expand all files Collapse all files

16
web/core/includes/menu.inc
View file

@ -10,10 +10,9 @@
* @{
*/
use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Render\FormattableMarkup;
use Drupal\Core\Render\Element;
/**
* Prepares variables for single local task link templates.
*
@ -37,7 +36,7 @@ function template_preprocess_menu_local_task(&$variables) {
$variables['is_active'] = TRUE;
// Add text to indicate active tab for non-visual users.
$active = SafeMarkup::format('<span class="visually-hidden">@label</span>', ['@label' => t('(active tab)')]);
$active = new FormattableMarkup('<span class="visually-hidden">@label</span>', ['@label' => t('(active tab)')]);
$link_text = t('@local-task-title@active', ['@local-task-title' => $link_text, '@active' => $active]);
}
@ -105,6 +104,7 @@ function menu_list_system_menus() {
* tasks.
*
* @see hook_menu_local_tasks_alter()
* @see https://www.drupal.org/node/2544940
*
* @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
*/
@ -117,6 +117,8 @@ function menu_local_tasks($level = 0) {
/**
* Returns the rendered local tasks at the top level.
*
* @see https://www.drupal.org/node/2874695
*
* @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
*/
function menu_primary_local_tasks() {
@ -130,6 +132,8 @@ function menu_primary_local_tasks() {
/**
* Returns the rendered local tasks at the second level.
*
* @see https://www.drupal.org/node/2874695
*
* @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
*/
function menu_secondary_local_tasks() {
@ -157,8 +161,14 @@ function menu_local_tabs() {
*
* This should be called any time broad changes
* might have been made to the router items or menu links.
*
* @deprecated in Drupal 8.6.0, will be removed before Drupal 9.0.0. Use
* \Drupal::cache('menu')->invalidateAll() instead.
*
* @see https://www.drupal.org/node/2989138
*/
function menu_cache_clear_all() {
@trigger_error("menu_cache_clear_all() is deprecated in Drupal 8.6.0 and will be removed before Drupal 9.0.0. Use \Drupal::cache('menu')->invalidateAll() instead. See https://www.drupal.org/node/2989138", E_USER_DEPRECATED);
\Drupal::cache('menu')->invalidateAll();
}