maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Use exec and silently fail in languagedetection, fixes #831, fixes #830

Browse Source 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
This commit is contained in:
Florian Aders (EleRas)
2011-07-11 17:28:10 +02:00
parent 026f8503ab
commit 0808bacb39
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/classes/output/class.languageSelect.php
View File

@@ -78,7 +78,10 @@ class languageSelect
# See for which language the codepages are compiled # See for which language the codepages are compiled
foreach ($this->availableLanguages as $lang) foreach ($this->availableLanguages as $lang)
{ {
preg_match_all("/[^|\w]".$lang.'.*/', `locale -a`, $matches); $tmplng = array();
@exec("locale -a", $tmplng);
$tmplng = join("\n", $tmplng);
preg_match_all("/[^|\w]".$lang.'.*/', $tmplng, $matches);
foreach($matches[0] as $m) foreach($matches[0] as $m)
{ {
if(preg_match('/utf8/', $m)) if(preg_match('/utf8/', $m))