diff --git a/core/modules/toolbar/lib/Drupal/toolbar/Routing/ToolbarController.php b/core/modules/toolbar/lib/Drupal/toolbar/Routing/ToolbarController.php index 685eccb..54d0433 100644 --- a/core/modules/toolbar/lib/Drupal/toolbar/Routing/ToolbarController.php +++ b/core/modules/toolbar/lib/Drupal/toolbar/Routing/ToolbarController.php @@ -9,10 +9,15 @@ use Symfony\Component\HttpFoundation\JsonResponse; +/** + * Defines a controller for the toolbar module. + */ class ToolbarController { /** * Returns the rendered subtree of each top-level toolbar link. + * + * @return \Symfony\Component\HttpFoundation\JsonResponse */ public function subtreesJSONP() { _toolbar_initialize_page_cache(); diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module index e46ffc7..b18f88a 100644 --- a/core/modules/toolbar/toolbar.module +++ b/core/modules/toolbar/toolbar.module @@ -111,28 +111,6 @@ function toolbar_element_info() { } /** - * Access callback: Returns if the user has access to the rendered subtree requested by the hash. - * - * @see toolbar_menu(). - */ -function _toolbar_subtrees_access($hash) { - -} - -/** - * Page callback: Returns the rendered subtree of each top-level toolbar link. - * - * @see toolbar_menu(). - */ -function toolbar_subtrees_jsonp($hash) { - _toolbar_initialize_page_cache(); - $subtrees = toolbar_get_rendered_subtrees(); - $response = new JsonResponse($subtrees); - $response->setCallback('Drupal.toolbar.setSubtrees'); - return $response; -} - -/** * Use Drupal's page cache for toolbar/subtrees/*, even for authenticated users. * * This gets invoked after full bootstrap, so must duplicate some of what's