diff options
author | root <root@diekershoff.homeunix.net> | 2011-01-04 09:22:43 +0100 |
---|---|---|
committer | root <root@diekershoff.homeunix.net> | 2011-01-04 09:22:43 +0100 |
commit | 51bcfb649fe2a20c9b8b1e66bc59e39da80d326b (patch) | |
tree | ef804b85942d5774a2c680d9696b65f3dc88d417 /index.php | |
parent | f3005918aff04fc435d0f526bf235bd95468294c (diff) | |
parent | f057cc3a70dd7435b4e9e8a2a07406f0f25e3f2a (diff) | |
download | volse-hubzilla-51bcfb649fe2a20c9b8b1e66bc59e39da80d326b.tar.gz volse-hubzilla-51bcfb649fe2a20c9b8b1e66bc59e39da80d326b.tar.bz2 volse-hubzilla-51bcfb649fe2a20c9b8b1e66bc59e39da80d326b.zip |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'index.php')
-rw-r--r-- | index.php | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -213,13 +213,13 @@ if($a->module != 'install') * Make sure the desired theme exists, though if the default theme doesn't exist we're stuffed. * */ - +$default_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : 'default'); if((x($_SESSION,'theme')) && (! file_exists('view/theme/' . $_SESSION['theme'] . '/style.css'))) unset($_SESSION['theme']); $a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array( '$stylesheet' => $a->get_baseurl() . '/view/theme/' - . ((x($_SESSION,'theme')) ? $_SESSION['theme'] : 'default') + . ((x($_SESSION,'theme')) ? $_SESSION['theme'] : $default_theme) . '/style.css' )); |