opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.1.1. For more information, see https://www.drupal.org/node/2718713

Browse source
This commit is contained in:
Pantheon Automation 2016-05-04 14:35:41 -07:00 • committed by Greg Anderson
parent c0a0d5a94c
commit 9eae24d844
669 changed files with 3873 additions and 1553 deletions
Download patch file Download diff file Expand all files Collapse all files

1
core/lib/Drupal/Core/Routing/AccessAwareRouter.php
View file

@ -134,4 +134,3 @@ class AccessAwareRouter implements AccessAwareRouterInterface {
}
}

2
core/lib/Drupal/Core/Routing/CompiledRoute.php
View file

@ -61,7 +61,7 @@ class CompiledRoute extends SymfonyCompiledRoute {
* @param array $variables
* An array of variables (variables defined in the path and in the host patterns)
*/
public function __construct($fit, $pattern_outline, $num_parts, $staticPrefix, $regex, array $tokens, array $pathVariables, $hostRegex = null, array $hostTokens = array(), array $hostVariables = array(), array $variables = array()) {
public function __construct($fit, $pattern_outline, $num_parts, $staticPrefix, $regex, array $tokens, array $pathVariables, $hostRegex = NULL, array $hostTokens = array(), array $hostVariables = array(), array $variables = array()) {
parent::__construct($staticPrefix, $regex, $tokens, $pathVariables, $hostRegex, $hostTokens, $hostVariables, $variables);
$this->fit = $fit;

2
core/lib/Drupal/Core/Routing/RouteCompiler.php
View file

@ -96,7 +96,7 @@ class RouteCompiler extends SymfonyRouteCompiler implements RouteCompilerInterfa
$fit = 0;
foreach ($parts as $k => $part) {
if (strpos($part, '{') === FALSE) {
$fit |= 1 << ($slashes - $k);
$fit |= 1 << ($slashes - $k);
}
}

8
core/lib/Drupal/Core/Routing/RouteProvider.php
View file

@ -207,13 +207,13 @@ class RouteProvider implements PreloadableRouteProviderInterface, PagedRouteProv
else {
try {
$result = $this->connection->query('SELECT name, route FROM {' . $this->connection->escapeTable($this->tableName) . '} WHERE name IN ( :names[] )', array(':names[]' => $routes_to_load));
$routes = $result->fetchAllKeyed();
$this->cache->set($cid, $routes, Cache::PERMANENT, ['routes']);
}
catch (\Exception $e) {
$result = [];
$routes = [];
}
$routes = $result->fetchAllKeyed();
$this->cache->set($cid, $routes, Cache::PERMANENT, ['routes']);
}
$this->serializedRoutes += $routes;

1
core/lib/Drupal/Core/Routing/UrlGenerator.php
View file

@ -153,7 +153,6 @@ class UrlGenerator implements UrlGeneratorInterface {
* @param string $name
* The route name or other identifying string from ::getRouteDebugMessage().
*
*
* @return string
* The url path, without any base path, including possible query string.
*