From dca406aa6444c39f630ec67497890c5d1f2d27af Mon Sep 17 00:00:00 2001
From: Larry Garfield <larry@garfieldtech.com>
Date: Sat, 11 Aug 2012 23:45:08 -0500
Subject: [PATCH] Only try to rebuild the router table if the dumper is
actually available.
---
core/includes/common.inc | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/core/includes/common.inc b/core/includes/common.inc
index 6300dece781b..b75185e23652 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -4,6 +4,7 @@
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Drupal\Core\Cache\CacheBackendInterface;
+use Symfony\Component\DependencyInjection\Container;
use Drupal\Core\Database\Database;
use Drupal\Core\Template\Attribute;
@@ -6846,13 +6847,15 @@ function router_rebuild() {
// a given item came from.
$callbacks = array();
- $dumper = drupal_container()->get('router.dumper');
+ $dumper = drupal_container()->get('router.dumper', Container::NULL_ON_INVALID_REFERENCE);
- foreach (module_implements('route_info') as $module) {
- $routes = call_user_func($module . '_route_info');
- drupal_alter('router_info', $routes);
- $dumper->addRoutes($routes);
- $dumper->dump(array('route_set' => $module));
+ if ($dumper) {
+ foreach (module_implements('route_info') as $module) {
+ $routes = call_user_func($module . '_route_info');
+ drupal_alter('router_info', $routes);
+ $dumper->addRoutes($routes);
+ $dumper->dump(array('route_set' => $module));
+ }
}
}
--
GitLab