From 1025fcf1e1e3aa823c94b2a2c0c3069a28c6940e Mon Sep 17 00:00:00 2001
From: Savetheinternet <savetheinternet@n0v4.com>
Date: Thu, 14 Apr 2011 22:12:56 +1000
Subject: themes

---
 inc/functions.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'inc/functions.php')

diff --git a/inc/functions.php b/inc/functions.php
index cec25137..f5c502f4 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -96,21 +96,28 @@
 	function loadThemeConfig($_theme) {
 		global $config;
 		
-		if(!file_exists($config['dir']['homepage'] . '/' . $_theme . '/theme.php'))
+		if(!file_exists($config['dir']['homepage'] . '/' . $_theme . '/info.php'))
 			return false;
 		
 		// Load theme information into $theme
-		include $config['dir']['homepage'] . '/' . $_theme . '/theme.php';
+		include $config['dir']['homepage'] . '/' . $_theme . '/info.php';
 		return $theme;
 	}
 	
 	function rebuildTheme($action) {
+		global $config;
+		
 		$query = query("SELECT `value` AS `theme` FROM `theme_settings` WHERE `name` = 'theme'") or error(db_error());
 		if($theme = $query->fetch()) {
 			// A theme is installed
+			$_theme = $theme['theme'];
 			
-			$theme = loadThemeConfig($theme['theme']);
-			$theme['build_function']($action, themeSettings());
+			$theme = loadThemeConfig($_theme);
+			
+			if(file_exists($config['dir']['homepage'] . '/' . $_theme . '/theme.php')) {
+				include $config['dir']['homepage'] . '/' . $_theme . '/theme.php';
+				$theme['build_function']($action, themeSettings());
+			}
 		}
 	}
 	
-- 
cgit v1.3