Merge branch 'master' of git://github.com/friendika/friendika

[friendica.git] / index.php

diff --git a/index.php b/index.php
index 05eef6c6e0bfe0f2e7475b29798ff96866702e6d..534cb93f7cf4ee38148030f55fefac6aa42878cc 100644 (file)
--- a/index.php
+++ b/index.php
@@ -29,22 +29,8 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
 
 @include(".htconfig.php");
 
-/**
- *
- * Get the language setting directly from system variables, bypassing get_config()
- * as database may not yet be configured.
- * 
- * If possible, we use the value from the browser.
- *
- */
-
-if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-       $langs = preg_split("/[,-]/",$_SERVER['HTTP_ACCEPT_LANGUAGE'],2);
-       $lang = $langs[0];
-} else {
-       $lang = ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en');
-}
 
+$lang = get_language();
        
 load_translation_table($lang);
 
@@ -124,6 +110,9 @@ if(! x($_SESSION,'authenticated'))
 if(! x($_SESSION,'sysmsg'))
        $_SESSION['sysmsg'] = '';
 
+if(! x($_SESSION,'sysmsg_info'))
+       $_SESSION['sysmsg_info'] = '';
+
 /*
  * check_config() is responsible for running update scripts. These automatically 
  * update the DB schema whenever we push a new one out. It also checks to see if
@@ -276,8 +265,16 @@ if(stristr($_SESSION['sysmsg'], t('Permission denied'))) {
 if(x($_SESSION,'sysmsg')) {
        $a->page['content'] = "<div id=\"sysmsg\" class=\"error-message\">{$_SESSION['sysmsg']}</div>\r\n"
                . ((x($a->page,'content')) ? $a->page['content'] : '');
+       $_SESSION['sysmsg']="";
        unset($_SESSION['sysmsg']);
 }
+if(x($_SESSION,'sysmsg_info')) {
+       $a->page['content'] = "<div id=\"sysmsg_info\" class=\"info-message\">{$_SESSION['sysmsg_info']}</div>\r\n"
+               . ((x($a->page,'content')) ? $a->page['content'] : '');
+       $_SESSION['sysmsg_info']="";
+       unset($_SESSION['sysmsg_info']);
+}
+
 
 
 call_hooks('page_end', $a->page['content']);