aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-05-13 04:52:29 -0700
committerfriendica <info@friendica.com>2012-05-13 04:52:29 -0700
commit3811fe288fe4446aaa890f9d98acbb3b670b7f3b (patch)
treea66cda15617a09a89408a74e5bed801a619b1f26
parenteaf028c9fb5c3eefc7dd7d4e4b1c4308cb071137 (diff)
downloadvolse-hubzilla-3811fe288fe4446aaa890f9d98acbb3b670b7f3b.tar.gz
volse-hubzilla-3811fe288fe4446aaa890f9d98acbb3b670b7f3b.tar.bz2
volse-hubzilla-3811fe288fe4446aaa890f9d98acbb3b670b7f3b.zip
rename get_language() to get_browser_language()
-rw-r--r--include/pgettext.php6
-rwxr-xr-xinclude/security.php2
-rw-r--r--index.php2
-rw-r--r--util/db_update.php2
4 files changed, 6 insertions, 6 deletions
diff --git a/include/pgettext.php b/include/pgettext.php
index a079a4687..5a0eab0b0 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 a92400b5c..af201d2af 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 a409f47b4..94329eedc 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 35620e80b..978594ab9 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");