mirror of
https://github.com/friendica/friendica
synced 2024-11-10 19:02:53 +00:00
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: path to default.php in theme dir was incorrect * master:
This commit is contained in:
commit
514780745f
1 changed files with 2 additions and 2 deletions
|
@ -360,13 +360,13 @@ $profile = $a->profile;
|
|||
|
||||
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';
|
||||
|
||||
if(file_exists($template))
|
||||
require_once($template);
|
||||
else
|
||||
require_once(str_replace(current_theme() . '/', '', $template));
|
||||
require_once(str_replace('theme/' . current_theme() . '/', '', $template));
|
||||
|
||||
session_write_close();
|
||||
exit;
|
||||
|
|
Loading…
Reference in a new issue