From: friendica <info@friendica.com>
Date: Sun, 13 May 2012 11:52:29 +0000 (-0700)
Subject: rename get_language() to get_browser_language()
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3811fe288fe4446aaa890f9d98acbb3b670b7f3b;p=friendica.git

rename get_language() to get_browser_language()
---

diff --git a/include/pgettext.php b/include/pgettext.php
index a079a46878..5a0eab0b01 100644
--- a/include/pgettext.php
+++ b/include/pgettext.php
@@ -15,10 +15,10 @@
  */
 
 
-if(! function_exists('get_language')) {
-function get_language() {
+if(! function_exists('get_browser_language')) {
+function get_browser_language() {
 
-	if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+	if (x($_SERVER,'HTTP_ACCEPT_LANGUAGE')) {
 	    // break up string into pieces (languages and q factors)
     	preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', 
 			$_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse);
diff --git a/include/security.php b/include/security.php
index a92400b5c4..af201d2af1 100755
--- a/include/security.php
+++ b/include/security.php
@@ -76,7 +76,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 	header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
 
 	if($login_initial) {
-		$l = get_language();
+		$l = get_browser_language();
 
 		q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d LIMIT 1",
 			dbesc(datetime_convert()),
diff --git a/index.php b/index.php
index a409f47b41..94329eedc8 100644
--- a/index.php
+++ b/index.php
@@ -27,7 +27,7 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
 
 @include(".htconfig.php");
 
-$lang = get_language();
+$lang = get_browser_language();
 	
 load_translation_table($lang);
 
diff --git a/util/db_update.php b/util/db_update.php
index 35620e80b7..978594ab9f 100644
--- a/util/db_update.php
+++ b/util/db_update.php
@@ -11,7 +11,7 @@ require_once("boot.php");
 $a = new App;
 @include(".htconfig.php");
 
-$lang = get_language();
+$lang = get_browser_language();
 load_translation_table($lang);
 
 require_once("dba.php");