aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/redbasic/php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-21 20:51:07 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-21 20:51:07 -0700
commitae6612025dcd31349056364d0c701bfda58470db (patch)
treec67db564af1d2368344205fda2889f336dd14925 /view/theme/redbasic/php
parent33c9d8e06b2af512d25b0c9063ce58d86b72f747 (diff)
parent0ad71b3efa7de4eb1f4313ffe4562ec83743bdc1 (diff)
downloadvolse-hubzilla-ae6612025dcd31349056364d0c701bfda58470db.tar.gz
volse-hubzilla-ae6612025dcd31349056364d0c701bfda58470db.tar.bz2
volse-hubzilla-ae6612025dcd31349056364d0c701bfda58470db.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: include/items.php util/messages.po
Diffstat (limited to 'view/theme/redbasic/php')
-rw-r--r--view/theme/redbasic/php/config.php6
-rw-r--r--view/theme/redbasic/php/style.php1
2 files changed, 5 insertions, 2 deletions
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 2603fb267..fe3ea9742 100644
--- 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;
+ }
}
}
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 956c1951c..6e68d38d5 100644
--- a/view/theme/redbasic/php/style.php
+++ b/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')) {