diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FrameworkBundle] fixed ESI calls

Browse Source
This commit is contained in:
Fabien Potencier 2012-12-20 23:02:55 +01:00
parent 06e1de9742
commit ce536cdd5a
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Symfony/Bundle/FrameworkBundle/HttpKernel.php
View File

@ -116,18 +116,30 @@ class HttpKernel extends BaseHttpKernel
}
if ($this->esiSupport && (true === $options['standalone'] || 'esi' === $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($options['alt'], 'http://') || 0 === strpos($options['alt'], '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']);
}
if ('js' === $options['standalone']) {
$uri = $this->generateInternalUri($controller, $options['attributes'], $options['query'], false);
if (0 === strpos($controller, 'http://') || 0 === strpos($controller, 'https://')) {
$uri = $controller;
} else {
$uri = $this->generateInternalUri($controller, $options['attributes'], $options['query'], false);
}
$defaultContent = null;
if ($template = $this->container->getParameter('templating.hinclude.default_template')) {