From d26fba7faf8d6a8683b65caeb99add954c093878 Mon Sep 17 00:00:00 2001
From: shish <shish@7f39781d-f577-437e-ae19-be835c7a54ca>
Date: Fri, 7 Nov 2008 14:30:02 +0000
Subject: [PATCH] and backport :3

git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@1108 7f39781d-f577-437e-ae19-be835c7a54ca
---
 core/util.inc.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/util.inc.php b/core/util.inc.php
index 3aa69fae..c4c2d28a 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -173,13 +173,15 @@ function _count_execs($db, $sql, $inputarray) {
 	$null = null; return $null;
 }
 
-function get_theme_object($file, $class) {
+function get_theme_object($file, $class, $fatal=true) {
 	if(class_exists("Custom$class")) {
 		$class = "Custom$class";
 		return new $class();
 	}
-	else {
+	elseif ($fatal || class_exists("{$base}Theme")) {
 		return new $class();
+	} else {
+		return false;
 	}
 }