X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=5f128ebb1b4754a9615a97d244d3bcc1b7db2dce;hb=9f5d3000c74253a1284abda16006d74df84073fe;hp=ae6a578cb4a68bb9b1b6c02b6e6a675643ed4fb7;hpb=5bfb0ba4c2ee23366651e1e38d3964098f99f5cf;p=friendica.git diff --git a/index.php b/index.php index ae6a578cb4..5f128ebb1b 100644 --- a/index.php +++ b/index.php @@ -140,7 +140,7 @@ if(strlen($a->module)) { } else { if((x($_SERVER,'QUERY_STRING')) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && isset($dreamhost_error_hack)) { - logger('index.php: dreamhost_error_hack invoked'); + logger('index.php: dreamhost_error_hack invoked. Original URI =' . $_SERVER['REQUEST_URI']); goaway($a->get_baseurl() . $_SERVER['REQUEST_URI']); } @@ -238,21 +238,10 @@ if($a->module != 'install') require_once('nav.php'); /** - * * Build the page - now that we have all the components - * 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_theme) - . '/style.css' - )); +$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => current_theme_url())); $page = $a->page; $profile = $a->profile;