comparison core/includes/menu.inc @ 17:129ea1e6d783

Update, including to Drupal core 8.6.10

 /**
  * @addtogroup menu
  * @{
  */
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\Render\Element;
 
 /**
  * Prepares variables for single local task link templates.
  *

 
   if (!empty($variables['element']['#active'])) {
     $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]);
   }
 
   $link['localized_options']['set_active_class'] = TRUE;
 

 /**
  * Clears all cached menu data.
  *
  * 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();
 }
 
 /**
  * @} End of "addtogroup menu".