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

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

* master:

1 files changed, 2 insertions, 2 deletions

diff --git a/index.php b/index.php
index 1cb16778a..f0ed00232 100644
--- a/index.php
+++ b/index.php
@@ -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;