Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-03-02 18:41:34 +01:00
Code Issues Packages Projects Releases Activity

Properly handle termination in twig redirect and if theme does not exist

Browse Source
This commit is contained in:
Matias Griese
2019-06-03 13:05:15 +03:00
parent ca89156c4f
commit 4e45c5be95
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
system/src/Grav/Common/Themes.php
View File

@@ -13,6 +13,7 @@ use Grav\Common\Config\Config;
use Grav\Common\File\CompiledYamlFile;
use Grav\Common\Data\Blueprints;
use Grav\Common\Data\Data;
use Grav\Framework\Psr7\Response;
use RocketTheme\Toolbox\Event\EventDispatcher;
use RocketTheme\Toolbox\Event\EventSubscriberInterface;
use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
@@ -214,7 +215,9 @@ class Themes extends Iterator
}
}
} elseif (!$locator('theme://') && !defined('GRAV_CLI')) {
exit("Theme '$name' does not exist, unable to display page.");
$response = new Response(500, [], "Theme '$name' does not exist, unable to display page.");
$grav->exit($response);
}
$this->config->set('theme', $config->get('themes.' . $name));

6
system/src/Grav/Common/Twig/TwigExtension.php
View File

@@ -29,6 +29,7 @@ use Grav\Common\User\Interfaces\UserInterface;
use Grav\Common\Utils;
use Grav\Common\Yaml;
use Grav\Common\Helpers\Base32;
use Grav\Framework\Psr7\Response;
use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
use Twig\Environment;
use Twig\Extension\AbstractExtension;
@@ -1110,8 +1111,9 @@ class TwigExtension extends AbstractExtension implements GlobalsInterface
*/
public function redirectFunc($url, $statusCode = 303)
{
header('Location: ' . $url, true, $statusCode);
exit();
$response = new Response($statusCode, ['location' => $url]);
$this->grav->exit($response);
}
/**