|
@@ -48,7 +48,7 @@ discard block |
|
|
block discarded – undo |
|
48
|
48
|
*/ |
|
49
|
49
|
public function generate($name, $parameters = [], $absolute = false) { |
|
50
|
50
|
asort($parameters); |
|
51
|
|
- $key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . sha1(json_encode($parameters)) . (int)$absolute; |
|
|
51
|
+ $key = $this->context->getHost().'#'.$this->context->getBaseUrl().$name.sha1(json_encode($parameters)).(int) $absolute; |
|
52
|
52
|
$cachedKey = $this->cache->get($key); |
|
53
|
53
|
if ($cachedKey) { |
|
54
|
54
|
return $cachedKey; |
|
@@ -77,7 +77,7 @@ discard block |
|
|
block discarded – undo |
|
77
|
77
|
return parent::findMatchingRoute($url); |
|
78
|
78
|
|
|
79
|
79
|
$this->eventLogger->start('cacheroute:match', 'Match route'); |
|
80
|
|
- $key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . '#rootCollection'; |
|
|
80
|
+ $key = $this->context->getHost().'#'.$this->context->getBaseUrl().'#rootCollection'; |
|
81
|
81
|
$cachedRoutes = $this->cache->get($key); |
|
82
|
82
|
if (!$cachedRoutes) { |
|
83
|
83
|
parent::loadRoutes(); |
|
@@ -94,7 +94,7 @@ discard block |
|
|
block discarded – undo |
|
94
|
94
|
// However, since Symfony does not allow empty route names, the route |
|
95
|
95
|
// we need to match is '/', so we need to append the '/' here. |
|
96
|
96
|
try { |
|
97
|
|
- $parameters = $matcher->match($url . '/'); |
|
|
97
|
+ $parameters = $matcher->match($url.'/'); |
|
98
|
98
|
} catch (ResourceNotFoundException $newException) { |
|
99
|
99
|
// If we still didn't match a route, we throw the original exception |
|
100
|
100
|
throw $e; |
Please login to merge, or discard this patch.
nextcloud /
server
