Merge branch 'friendika-master'

diff --combined index.php
index 09276e3493e4e24aa1affcfedb6d910f07d3b4f3,abc02521a2ccfec896cfc83922bdd8c193ad1eef..2e14e7d2ac18bf920d00040d789c9633f66d450e
--- 1/index.php
--- 2/index.php
+++ b/index.php
@@@ -127,6 -127,7 +127,7 @@@ els
   * further processing.
   */
  
+ 
  if(strlen($a->module)) {
        if(file_exists("mod/{$a->module}.php")) {
                include("mod/{$a->module}.php");
@@@ -212,13 -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'
        ));