From 1e8542da9cecbee7d1e73a471e1dfdd5651d0c30 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@kunena.org>
Date: Tue, 5 Aug 2014 15:11:07 +0300
Subject: [PATCH] Add support for themes to return instantiated Theme object

---
 system/src/Grav/Common/Themes.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/system/src/Grav/Common/Themes.php b/system/src/Grav/Common/Themes.php
index 6efedbbf2..f21e8faac 100644
--- a/system/src/Grav/Common/Themes.php
+++ b/system/src/Grav/Common/Themes.php
@@ -83,12 +83,14 @@ class Themes
 
         $file = THEMES_DIR . "{$name}/{$name}.php";
         if (file_exists($file)) {
-            require_once $file;
+            $class = require_once $file;
 
-            $className = '\\Grav\\Theme\\' . ucfirst($name);
+            if (!is_object($class)) {
+                $className = '\\Grav\\Theme\\' . ucfirst($name);
 
-            if (class_exists($className)) {
-                $class = new $className;
+                if (class_exists($className)) {
+                    $class = new $className;
+                }
             }
         }