From 3f6901c03648d99375dabdd87550a956edf212a5 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Wed, 10 Sep 2014 20:40:49 +0300 Subject: [PATCH] Fail gracefully when theme does not exist --- system/src/Grav/Common/Themes.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/system/src/Grav/Common/Themes.php b/system/src/Grav/Common/Themes.php index ca5854ecb..16e1f7923 100644 --- a/system/src/Grav/Common/Themes.php +++ b/system/src/Grav/Common/Themes.php @@ -132,7 +132,7 @@ class Themes extends Iterator /** @var ResourceLocator $locator */ $locator = $grav['locator']; - $file = $locator("theme://theme.php") ?: $locator("theme://{$name}.php"); + $file = $locator('theme://theme.php') ?: $locator("theme://{$name}.php"); if ($file) { // Local variables available in the file: $grav, $config, $name, $file @@ -145,6 +145,8 @@ class Themes extends Iterator $class = new $className($grav, $config, $name); } } + } elseif (!$locator('theme://')) { + exit("Theme '$name' does not exist, unable to display page."); } if (empty($class)) {