diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-04-03 21:36:29 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-04-03 21:36:29 -0400 |
| commit | 0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f (patch) | |
| tree | a92197de4503ec52889dc05483493f4df1a305b8 /view/theme/redbasic/php | |
| parent | 99d9456b3addc651a68874ddd391d25684252c4d (diff) | |
| parent | b4c1baada1fba46d4d75f40a7e78111d70d54e7a (diff) | |
| download | volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.tar.gz volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.tar.bz2 volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help
Diffstat (limited to 'view/theme/redbasic/php')
| -rw-r--r-- | view/theme/redbasic/php/config.php | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 66597332c..04cf4f904 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -97,8 +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(), - '$theme' => $a->channel['channel_theme'], + '$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 6058a3c14..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(); @@ -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', '---'); |