diff options
| author | Michael <icarus@dabo.de> | 2012-05-19 16:55:33 +0200 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-05-19 16:55:33 +0200 |
| commit | 6342b3e0bdd5774857a8fca809994f05e0208d25 (patch) | |
| tree | 54114a005e74c8a6d8bad8a490e1d1e41bc4178f /include/pgettext.php | |
| parent | 2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7 (diff) | |
| parent | 9a940786c18c1c2bd772aec93f1828f67dc45667 (diff) | |
| download | volse-hubzilla-6342b3e0bdd5774857a8fca809994f05e0208d25.tar.gz volse-hubzilla-6342b3e0bdd5774857a8fca809994f05e0208d25.tar.bz2 volse-hubzilla-6342b3e0bdd5774857a8fca809994f05e0208d25.zip | |
Merge branch 'master' of github.com:annando/friendica
Diffstat (limited to 'include/pgettext.php')
| -rw-r--r-- | include/pgettext.php | 6 |
1 files changed, 3 insertions, 3 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); |