commit 72e7d3ad08bd7d8ffed553d4605c72a3bba70b8a Author: Joel Pittet Date: Tue Apr 29 20:52:11 2014 -0700 fixes and doc block variables diff --git a/core/lib/Drupal/Core/Cache/DatabaseBackend.php b/core/lib/Drupal/Core/Cache/DatabaseBackend.php index 27e943d..3ae9eac 100644 --- a/core/lib/Drupal/Core/Cache/DatabaseBackend.php +++ b/core/lib/Drupal/Core/Cache/DatabaseBackend.php @@ -53,9 +53,6 @@ public function __construct(Connection $connection, $bin) { * Implements Drupal\Core\Cache\CacheBackendInterface::get(). */ public function get($cid, $allow_invalid = FALSE) { - if ($this->bin == 'render') { - return NULL; - } $cids = array($cid); $cache = $this->getMultiple($cids, $allow_invalid); return reset($cache); diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuTree.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuTree.php index b390232..c9d6005 100644 --- a/core/modules/menu_link/lib/Drupal/menu_link/MenuTree.php +++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuTree.php @@ -427,7 +427,6 @@ public function renderTree($tree, $level = 0) { $element['original_link'] = $data['link']; // Index using the link's unique mlid. $build[$data['link']['mlid']] = $element; - } if (!$build) { diff --git a/core/modules/system/templates/menu.html.twig b/core/modules/system/templates/menu.html.twig index 0e96c3f..d173a86 100644 --- a/core/modules/system/templates/menu.html.twig +++ b/core/modules/system/templates/menu.html.twig @@ -2,9 +2,21 @@ /** * @file * Default theme implementation to display a menu. + * + * Available variables: + * - menu_name: The machine name of the menu. + * - items: A nested list of menu items. Each menu item contains: + * - attributes: HTML attributes for the menu item. + * - below: The menu item child items. + * - title: The menu link title. + * - href: The menu link url. + * - localized_options: Menu link localized options. + * + * @ingroup themeable + */ #} {% import _self as menus %} -