diff options
author | Michael Vogel <icarus@dabo.de> | 2012-04-14 13:15:25 +0200 |
---|---|---|
committer | Michael Vogel <icarus@dabo.de> | 2012-04-14 13:15:25 +0200 |
commit | 4e220ec391514fbdeaa7d64abfd1752a9b44bbaa (patch) | |
tree | 1cb3cb621221e948be9e0e91916aac0dd6fccb0e /view/theme/quattro/style.php | |
parent | 572678fef95816deaa1ecafe5cbcfb8cc65963c9 (diff) | |
parent | 0d869ceb65badbd4d80dd0d5cf2d631bca7f5b9e (diff) | |
download | volse-hubzilla-4e220ec391514fbdeaa7d64abfd1752a9b44bbaa.tar.gz volse-hubzilla-4e220ec391514fbdeaa7d64abfd1752a9b44bbaa.tar.bz2 volse-hubzilla-4e220ec391514fbdeaa7d64abfd1752a9b44bbaa.zip |
Merge commit 'upstream/master'
Diffstat (limited to 'view/theme/quattro/style.php')
-rw-r--r-- | view/theme/quattro/style.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/view/theme/quattro/style.php b/view/theme/quattro/style.php index b6104a170..fa02a04b6 100644 --- a/view/theme/quattro/style.php +++ b/view/theme/quattro/style.php @@ -1,11 +1,18 @@ <?php - $color = false; + $color=false; + $quattro_align=false; + $site_color = get_config("quattro","color"); + $site_quattro_align = get_config("quattro", "align" ); + if (local_user()) { $color = get_pconfig(local_user(), "quattro","color"); $quattro_align = get_pconfig(local_user(), 'quattro', 'align' ); } + if ($color===false) $color=$site_color; if ($color===false) $color="dark"; + if ($quattro_align===false) $quattro_align=$site_quattro_align; + if (file_exists("$THEMEPATH/$color/style.css")){ echo file_get_contents("$THEMEPATH/$color/style.css"); |