aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-03-09 16:23:46 -0800
committerredmatrix <git@macgirvin.com>2016-03-09 16:23:46 -0800
commite95a494041d774584184f5d56ca807c771aa78d1 (patch)
treee54f1d180c8f0f4b3849c9012e7e55fdcfc29e6a
parent7732532964cfa43c371ee70418fea0279846c7b6 (diff)
parentbb09b8a38546538c28f7f3d0aa0d6e5506210c37 (diff)
downloadvolse-hubzilla-e95a494041d774584184f5d56ca807c771aa78d1.tar.gz
volse-hubzilla-e95a494041d774584184f5d56ca807c771aa78d1.tar.bz2
volse-hubzilla-e95a494041d774584184f5d56ca807c771aa78d1.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
-rw-r--r--doc/DerivedTheme1.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/DerivedTheme1.md b/doc/DerivedTheme1.md
index 23f2916a4..3db86b6e7 100644
--- a/doc/DerivedTheme1.md
+++ b/doc/DerivedTheme1.md
@@ -79,8 +79,8 @@ If you want to use the redbasic schemas for your derived theme, you have to do a
Do everything as above, but don't create view/theme/mytheme/php/style.php, but copy instead view/theme/redbasic/php/style.php to view/theme/mytheme/php/style.php. Modify that file and remove (or comment out) these two lines:
- if($a->channel['channel_theme'] != 'redbasic')
- set_pconfig(local_channel(), 'redbasic', 'schema', '---');
+ if(local_channel() && $a->channel && $a->channel['channel_theme'] != 'redbasic')
+ set_pconfig(local_channel(), 'redbasic', 'schema', '---');
Also add this line at the bottom: