Merge branch 'friendika-master'

[friendica.git] / index.php

diff --git a/index.php b/index.php
index abc02521a2ccfec896cfc83922bdd8c193ad1eef..2e14e7d2ac18bf920d00040d789c9633f66d450e 100644 (file)
--- a/index.php
+++ b/index.php
@@ -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'
        ));