diff options
| author | Michael <icarus@dabo.de> | 2012-04-14 13:03:40 +0200 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-04-14 13:03:40 +0200 |
| commit | 188829ed46be6d3c7a91380226e26e8292c327be (patch) | |
| tree | 2fb4148bc2222cf198309f4025862080c89fe36b /view/theme/quattro/style.php | |
| parent | 7384786d4417ddd051b7daa71c019d3c551efc68 (diff) | |
| parent | 0d869ceb65badbd4d80dd0d5cf2d631bca7f5b9e (diff) | |
| download | volse-hubzilla-188829ed46be6d3c7a91380226e26e8292c327be.tar.gz volse-hubzilla-188829ed46be6d3c7a91380226e26e8292c327be.tar.bz2 volse-hubzilla-188829ed46be6d3c7a91380226e26e8292c327be.zip | |
Merge remote branch '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"); |