Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/items.php
	util/messages.po

view/theme/redbasic/php/config.php

@@ -84,8 +84,10 @@ function redbasic_form(&$a, $arr) {
 	if($files) {
 		foreach($files as $file) {
 			$f = basename($file, ".php");
-			$scheme_name = $f;
-			$scheme_choices[$f] = $scheme_name;
+			if($f != 'default') {
+				$scheme_name = $f;
+				$scheme_choices[$f] = $scheme_name;
+			}
 		}
 	}
 

view/theme/redbasic/php/style.php

@@ -70,6 +70,7 @@ if (($schema) && ($schema != '---')) {
 
 // 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.
+// default.php and default.css MUST be symlinks to existing schema files.
 if (! $schema) {
 
 	if(file_exists('view/theme/redbasic/schema/default.php')) {