[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[23630] branches/4.x/lib/tikilib.php

[<sy...@us...>]

Revision: 23630
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=23630&view=rev
Author:   sylvieg
Date:     2009-12-02 17:21:16 +0000 (Wed, 02 Dec 2009)

Log Message:
-----------
[FIX]language: browser langauge must be limited to available language(ex: en_uk can be the browser language and not selected)

Modified Paths:
--------------
    branches/4.x/lib/tikilib.php

Modified: branches/4.x/lib/tikilib.php
===================================================================
--- branches/4.x/lib/tikilib.php	2009-12-02 16:33:06 UTC (rev 23629)
+++ branches/4.x/lib/tikilib.php	2009-12-02 17:21:16 UTC (rev 23630)
@@ -8521,7 +8521,7 @@
 	if (is_dir("lang")) {
 		$dh = opendir("lang");
 		while ($lang = readdir($dh)) {
-			if (!strpos($lang,'.') and is_dir("lang/$lang") and file_exists("lang/$lang/language.php")) {
+			if (!strpos($lang,'.') and is_dir("lang/$lang") and file_exists("lang/$lang/language.php") and (empty($prefs['available_languages']) || in_array($lang, $prefs['available_languages']))) {
 				$available[strtolower($lang)] = $lang;
 				$available_aprox[substr(strtolower($lang), 0, 2)] = $lang;
 			}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.