aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/redbasic/php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-03-07 15:12:09 -0800
committerredmatrix <git@macgirvin.com>2016-03-07 15:12:09 -0800
commit1a77fb4c1d4348ed75ab220f73526294f13606a3 (patch)
tree381e9dfc784116447d54cd5c46f8ceb7b75b2e66 /view/theme/redbasic/php
parent76467b5a35111c44ff539146ab0810118b42dc70 (diff)
parent6824fb9f935e1e2a5405571a08b4c1a3c43a7768 (diff)
downloadvolse-hubzilla-1a77fb4c1d4348ed75ab220f73526294f13606a3.tar.gz
volse-hubzilla-1a77fb4c1d4348ed75ab220f73526294f13606a3.tar.bz2
volse-hubzilla-1a77fb4c1d4348ed75ab220f73526294f13606a3.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view/theme/redbasic/php')
-rw-r--r--view/theme/redbasic/php/config.php1
-rw-r--r--view/theme/redbasic/php/style.php5
2 files changed, 6 insertions, 0 deletions
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 6bea5bddb..66597332c 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -98,6 +98,7 @@ if(feature_enabled(local_channel(),'expert'))
$o .= replace_macros($t, array(
'$submit' => t('Submit'),
'$baseurl' => $a->get_baseurl(),
+ '$theme' => $a->channel['channel_theme'],
'$expert' => $expert,
'$title' => t("Theme settings"),
'$schema' => array('redbasic_schema', t('Select scheme'), $arr['schema'], '', $scheme_choices),
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 0ca47b1fb..ef1450681 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -215,3 +215,8 @@ if($align_left && file_exists('view/theme/redbasic/css/align_left.css')) {
if($schemecss) {
echo $schemecss;
}
+
+// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this.
+
+if($a->channel['channel_theme'] != 'redbasic')
+ set_pconfig(local_channel(), 'redbasic', 'schema', '---');