tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

Browse source 
* remotes/upstream/master:
  path to default.php in theme dir was incorrect

* master:
This commit is contained in:
Simon L'nu 2012-04-10 05:03:32 -04:00
commit 514780745f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
index.php
View file

@ -360,13 +360,13 @@ $profile = $a->profile;
header("Content-type: text/html; charset=utf-8"); header("Content-type: text/html; charset=utf-8");
$template = 'view/' . current_theme() . '/' $template = 'view/theme/' . current_theme() . '/'
. ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php'; . ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php';
if(file_exists($template)) if(file_exists($template))
require_once($template); require_once($template);
else else
require_once(str_replace(current_theme() . '/', '', $template)); require_once(str_replace('theme/' . current_theme() . '/', '', $template));
session_write_close(); session_write_close();
exit; exit;