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

Conflicts: include/items.php util/messages.po
2015-06-21 20:51:07 -07:00
parent 33c9d8e06b 0ad71b3efa
commit ae6612025d
29 changed files with 542 additions and 334 deletions
--- a/view/theme/redbasic/php/config.php
+++ b/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;
+			}
 		}
 	}