Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2026037 by Crell: Check for legacy controllers based on the legacy flag, not the callable type.

8.0.x
webchick 2013-08-11 23:42:02 -07:00
parent 859642ea2e
commit 2a4e466139
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/lib/Drupal/Core/EventSubscriber/LegacyControllerSubscriber.php
View File

@ -37,11 +37,11 @@ class LegacyControllerSubscriber implements EventSubscriberInterface {
*/
public function onKernelControllerLegacy(FilterControllerEvent $event) {
$request = $event->getRequest();
$router_item = $request->attributes->get('_drupal_menu_item');
$controller = $event->getController();
// This BC logic applies only to functions. Otherwise, skip it.
if (is_string($controller) && function_exists($controller)) {
// If we're dealing with a legacy route, wrap the controller in a closure
// so parameters still work.
if ($request->attributes->get('_legacy')) {
$router_item = $request->attributes->get('_drupal_menu_item');
$new_controller = function() use ($router_item) {
return call_user_func_array($router_item['page_callback'], $router_item['page_arguments']);
};