From 30e4a360847762bfc8afce6704261ea5cc38650c Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Wed, 16 Oct 2013 17:08:19 +0100
Subject: Don't break themes by using functions we don't need.

If you've got a theme that started off copying Redbasic (ie, all of you) need to do this too.
---
 view/theme/redbasic/php/config.php |  2 +-
 view/theme/redbasic/php/style.php  | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'view/theme/redbasic/php')

diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index faf6c6f35..44ddb78b9 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -39,7 +39,7 @@ function redbasic_form(&$a, $schema, $nav_colour, $bgcolour, $background_image,
 
 	$scheme_choices = array();
 	$scheme_choices["---"] = t("Default");
-	$files = glob('view/theme/' . current_theme() . '/schema/*');
+	$files = glob('view/theme/redbasic/schema/*');
 	if($files) {
 		foreach($files as $file) {
 			$f = basename($file, ".php");
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index b5d020937..1f3e46d9d 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -1,4 +1,5 @@
 <?php
+  logger('redbasic start');
 
 // Get the UID of the channel owner
 	$uid = get_theme_uid();
@@ -29,14 +30,14 @@
 // not --- like the mobile theme does instead.
 
 		if (($schema) && ($schema != '---')) {
-			$schemefile = 'view/theme/' . current_theme() . '/schema/' . $schema . '.php';
+			$schemefile = 'view/theme/redbasic/schema/' . $schema . '.php';
 			require_once ($schemefile);
 		}
 		// If we haven't got a schema, load the default.  We shouldn't touch this - we
 		// should leave it for admins to define for themselves.
 			if (! $schema) {
-			      if(file_exists('view/theme/' . current_theme() . '/schema/default.php')) {
-				    $schemefile = 'view/theme/' . current_theme() . '/schema/' . 'default.php';
+			      if(file_exists('view/theme/redbasic/schema/default.php')) {
+				    $schemefile = 'view/theme/redbasic/schema/' . 'default.php';
 				    require_once ($schemefile);
 				    }
 			}
@@ -97,8 +98,8 @@
 
 		
 // Apply the settings
-	if(file_exists('view/theme/' . current_theme() . '/css/style.css')) {
-		$x = file_get_contents('view/theme/' . current_theme() . '/css/style.css');
+	if(file_exists('view/theme/redbasic/css/style.css')) {
+		$x = file_get_contents('view/theme/redbasic/css/style.css');
 
 $options = array (
 '$nav_bg_1' => $nav_bg_1,
-- 
cgit v1.2.3