diff options
| author | redmatrix <git@macgirvin.com> | 2016-03-31 17:32:51 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-03-31 17:32:51 -0700 |
| commit | c0b3d7e1b480ceeed89b71efd056ed9edda2dfef (patch) | |
| tree | 433552545eb0c746fb48666afdb74ff472bf17b1 /view/theme | |
| parent | 50d9b2934742ad9fb0dc8354d405789e3c14cd00 (diff) | |
| parent | 9abd95fad3784a10fc48bc40f9b8a75d7d74edda (diff) | |
| download | volse-hubzilla-c0b3d7e1b480ceeed89b71efd056ed9edda2dfef.tar.gz volse-hubzilla-c0b3d7e1b480ceeed89b71efd056ed9edda2dfef.tar.bz2 volse-hubzilla-c0b3d7e1b480ceeed89b71efd056ed9edda2dfef.zip | |
Merge branch 'static'
Diffstat (limited to 'view/theme')
| -rw-r--r-- | view/theme/redbasic/php/config.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 789efc612..04cf4f904 100644 --- a/view/theme/redbasic/php/config.php +++ b/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), 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', '---'); |