diff options
| author | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-06-04 12:04:17 +0530 |
|---|---|---|
| committer | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-06-04 12:04:17 +0530 |
| commit | 12474e3c2eb21e4b5f9f6cd4b9d223f1f39bfe89 (patch) | |
| tree | 49e5e7dd30e1b1263fa5a9c9921b4a59758d94bd /include/pgettext.php | |
| parent | 3a45d4f9e0af301b8fdd4d509fc7ffe7514fb519 (diff) | |
| parent | ca105f1c669950768a1f4cd6b93f471cabbc5114 (diff) | |
| download | volse-hubzilla-12474e3c2eb21e4b5f9f6cd4b9d223f1f39bfe89.tar.gz volse-hubzilla-12474e3c2eb21e4b5f9f6cd4b9d223f1f39bfe89.tar.bz2 volse-hubzilla-12474e3c2eb21e4b5f9f6cd4b9d223f1f39bfe89.zip | |
Merge branch 'master' of git://github.com/friendica/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); |