aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2014-03-02 10:27:08 +0100
committermarijus <mario@mariovavti.com>2014-03-02 10:27:08 +0100
commit2313736e92f8e89d46cdb002c9d6b2b82f1d6511 (patch)
tree22c4493a364ec2f90d752464a0d57d2441f9f20e /boot.php
parentdb266958c43196564ff8ee30fc1e95a0f459c185 (diff)
parentbf401a5afaca8f96606b22e219bd595646ac9dab (diff)
downloadvolse-hubzilla-2313736e92f8e89d46cdb002c9d6b2b82f1d6511.tar.gz
volse-hubzilla-2313736e92f8e89d46cdb002c9d6b2b82f1d6511.tar.bz2
volse-hubzilla-2313736e92f8e89d46cdb002c9d6b2b82f1d6511.zip
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index d080b7774..1c7e5f147 100755
--- a/boot.php
+++ b/boot.php
@@ -1852,7 +1852,11 @@ function construct_page(&$a) {
require_once('include/js_strings.php');
- head_add_css(((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.css');
+ if(x($a->page,'template_style'))
+ head_add_css($a->page['template_style'] . '.css');
+ else
+ head_add_css(((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.css');
+
head_add_css('mod_' . $a->module . '.css');
head_add_css(current_theme_url($installing));