[FrameworkBundle] fixed ESI calls

This commit is contained in:
Fabien Potencier 2012-12-20 23:13:30 +01:00
parent 369e4a645b
commit b8e5689363

View File

@ -113,11 +113,19 @@ class HttpKernel extends BaseHttpKernel
}
if ($this->esiSupport && $options['standalone']) {
$uri = $this->generateInternalUri($controller, $options['attributes'], $options['query']);
if (0 === strpos($controller, 'http://') || 0 === strpos($controller, 'https://')) {
$uri = $controller;
} else {
$uri = $this->generateInternalUri($controller, $options['attributes'], $options['query']);
}
$alt = '';
if ($options['alt']) {
$alt = $this->generateInternalUri($options['alt'][0], isset($options['alt'][1]) ? $options['alt'][1] : array(), isset($options['alt'][2]) ? $options['alt'][2] : array());
if (is_string($options['alt']) && (0 === strpos($controller, 'http://') || 0 === strpos($controller, 'https://'))) {
$alt = $options['alt'];
} else {
$alt = $this->generateInternalUri($options['alt'][0], isset($options['alt'][1]) ? $options['alt'][1] : array(), isset($options['alt'][2]) ? $options['alt'][2] : array());
}
}
return $this->container->get('esi')->renderIncludeTag($uri, $alt, $options['ignore_errors'], $options['comment']);