Merge upstream

2013-10-20 01:22:51 +02:00
parent c0789bdb4f 49fb6326e0
commit 2db45695e8
88 changed files with 4338 additions and 2844 deletions
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -41,7 +41,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/*.php');
 	if($files) {
 		foreach($files as $file) {
 			$f = basename($file, ".php");