diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-05-16 08:24:46 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-05-16 08:24:46 +0200 |
| commit | f2c0c40f6e488f1a8e62bda9449b28115f343cac (patch) | |
| tree | ae1418141f85be49b7d8cb3d2a0e8b2a7acc4eb4 /include/pgettext.php | |
| parent | f2e648d62fe7cafb9a55c7505687ea4d1c294778 (diff) | |
| parent | a65bd73bf3f4a1e6ccfcdf0a06c70a4f1f4182ce (diff) | |
| download | volse-hubzilla-f2c0c40f6e488f1a8e62bda9449b28115f343cac.tar.gz volse-hubzilla-f2c0c40f6e488f1a8e62bda9449b28115f343cac.tar.bz2 volse-hubzilla-f2c0c40f6e488f1a8e62bda9449b28115f343cac.zip | |
Merge remote branch 'upstream/master'
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); |