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

[friendica.git] / index.php

diff --git a/index.php b/index.php
index 139f0a38b0e1dd8f3cc56f0ae21417e841f3e2e3..0916ed8b10e2e4e3ff436d11d265950dbc02b8aa 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -41,7 +41,7 @@ require_once("dba.php");
 $db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
         unset($db_host, $db_user, $db_pass, $db_data);
 
-        
+
 if(! $install) {
 
        /**
@@ -342,13 +342,13 @@ $profile = $a->profile;
 
 header("Content-type: text/html; charset=utf-8");
 
-$template = 'view/' . $lang . '/' 
+$template = 'view/' . current_theme() . '/' 
        . ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php';
 
 if(file_exists($template))
        require_once($template);
 else
-       require_once(str_replace($lang . '/', '', $template));
+       require_once(str_replace(current_theme() . '/', '', $template));
 
 session_write_close();
 exit;