Resolved conflict in view/it/hstrings.php

2 files changed, 9 insertions, 4 deletions

diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 6bea5bddb..04cf4f904 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -97,7 +97,8 @@ if(feature_enabled(local_channel(),'expert'))
 	  $t = get_markup_template('theme_settings.tpl');
 	  $o .= replace_macros($t, array(
 		'$submit' => t('Submit'),
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => z_root(),
+		'$theme' => App::$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 a0da5e302..83c35935a 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -1,6 +1,6 @@
 <?php
 
-if(! $a->install) {
+if(! App::$install) {
 
 	// Get the UID of the channel owner
 	$uid = get_theme_uid();
@@ -40,7 +40,6 @@ if(! $a->install) {
 	$nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity');
 	$top_photo=get_pconfig($uid,'redbasic','top_photo');
 	$reply_photo=get_pconfig($uid,'redbasic','reply_photo');
-
 }
 
 // Now load the scheme.  If a value is changed above, we'll keep the settings
@@ -154,7 +153,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
 
 	$x = file_get_contents('view/theme/redbasic/css/style.css');
 
-	$aside_width = 285;
+	$aside_width = 287;
 
 	// left aside and right aside are 285px + converse width
 	if($align_left) {
@@ -216,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(local_channel() && App::$channel && App::$channel['channel_theme'] != 'redbasic')
+	set_pconfig(local_channel(), 'redbasic', 'schema', '---');