diff --git a/core/modules/block/lib/Drupal/block/BlockListController.php b/core/modules/block/lib/Drupal/block/BlockListController.php index 54fba33..f4e2a5e 100644 --- a/core/modules/block/lib/Drupal/block/BlockListController.php +++ b/core/modules/block/lib/Drupal/block/BlockListController.php @@ -108,10 +108,13 @@ public function load() { * Overrides \Drupal\Core\Entity\EntityListController::render(). * * @param string|null $theme - * (optional) The theme to dislay the blocks for. If NULL, the current theme - * will be used. + * (optional) The theme to display the blocks for. If NULL, the current + * theme will be used. * @param \Symfony\Component\HttpFoundation\Request $request * The current request. + * + * @return array + * The block list as a renderable array. */ public function render($theme = NULL, Request $request = NULL) { $this->request = $request; diff --git a/core/modules/block/lib/Drupal/block/Controller/BlockListController.php b/core/modules/block/lib/Drupal/block/Controller/BlockListController.php index f31e652..2852970 100644 --- a/core/modules/block/lib/Drupal/block/Controller/BlockListController.php +++ b/core/modules/block/lib/Drupal/block/Controller/BlockListController.php @@ -9,6 +9,7 @@ use Drupal\Core\Entity\Controller\EntityListController; use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Component\HttpFoundation\Request; /** * Defines a controller to list blocks. @@ -20,13 +21,15 @@ class BlockListController extends EntityListController { * * @param string|null $theme * Theme key of block list. + * @param \Symfony\Component\HttpFoundation\Request $request + * The current request. * * @return array * A render array as expected by drupal_render(). */ - public function listing($theme = NULL) { + public function listing($theme = NULL, Request $request = NULL) { $theme = $theme ?: $this->config('system.theme')->get('default'); - return $this->entityManager()->getListController('block')->render($theme); + return $this->entityManager()->getListController('block')->render($theme, $request); } }