diff --git a/core/includes/menu.inc b/core/includes/menu.inc index 2c52eff..8851673 100644 --- a/core/includes/menu.inc +++ b/core/includes/menu.inc @@ -902,7 +902,7 @@ function _menu_link_translate(&$item, $translate = FALSE) { $request = Request::create('/' . $item['path']); $item['access'] = drupal_container()->get('access_manager')->check($route, $request); } - else if (!empty($item['load_functions']) && !_menu_load_objects($item, $map)) { + elseif (!empty($item['load_functions']) && !_menu_load_objects($item, $map)) { // An error occurred loading an object. $item['access'] = FALSE; return FALSE; diff --git a/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php b/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php index 77d7610..b4d281d 100644 --- a/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php +++ b/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php @@ -274,7 +274,7 @@ public function getRoute() { if (!$this->route_name) { return NULL; } - if (! $this->routeObject instanceof Route) { + if (!($this->routeObject instanceof Route)) { $route_provider = drupal_container()->get('router.route_provider'); $this->routeObject = $route_provider->getRouteByName($this->route_name); } @@ -285,7 +285,7 @@ public function getRoute() { * Sets the route object for this link. * * This should only be called by MenuLinkStorageController when loading - * the link object. Calling it at other times could result in unpredictable + * the link object. Calling it at other times could result in unpredictable * behavior. * * @param \Symfony\Component\Routing\Route $route diff --git a/core/modules/menu_link/menu_link.module b/core/modules/menu_link/menu_link.module index 74532f4..ed11c78 100644 --- a/core/modules/menu_link/menu_link.module +++ b/core/modules/menu_link/menu_link.module @@ -117,7 +117,7 @@ function menu_link_delete_multiple(array $mlids, $force = FALSE, $prevent_repare * The menu link entity to be saved. */ function menu_link_save(MenuLink $menu_link) { - return $menu_link->save(); + $menu_link->save(); } /** diff --git a/core/modules/user/user.module b/core/modules/user/user.module index 9ced79b..538686d 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -878,14 +878,12 @@ function user_menu() { // paths managed by the new routing system: http://drupal.org/node/1793520. $items['user/autocomplete'] = array( 'title' => 'User autocomplete', - // _menu_router_build() denies access to paths without a page callback. 'route_name' => 'user_autocomplete', 'type' => MENU_CALLBACK, ); $items['user/autocomplete/anonymous'] = array( 'title' => 'User autocomplete including anonymous', - // _menu_router_build() denies access to paths without a page callback. 'route_name' => 'user_autocomplete_anonymous', 'type' => MENU_CALLBACK, );