Merge branch 'static'

view/theme/redbasic/php/config.php

@@ -98,7 +98,7 @@ if(feature_enabled(local_channel(),'expert'))
 	  $o .= replace_macros($t, array(
 		'$submit' => t('Submit'),
 		'$baseurl' => z_root(),
-		'$theme' => $a->channel['channel_theme'],
+		'$theme' => App::$channel['channel_theme'],
 		'$expert' => $expert,
 		'$title' => t("Theme settings"),
 		'$schema' => array('redbasic_schema', t('Select scheme'), $arr['schema'], '', $scheme_choices),

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();
@@ -218,5 +218,5 @@ if($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() && $a->channel && $a->channel['channel_theme'] != 'redbasic')
+if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'redbasic')
 	set_pconfig(local_channel(), 'redbasic', 'schema', '---');