Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[23633] branches/proposed/lib/tikilib.php

[Jonny B. <tw...@no...>]

+1

On 2 Dec 2009, at 18:25, sy...@us... wrote:

> Revision: 23633
>          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=23633&view=rev
> Author:   sylvieg
> Date:     2009-12-02 18:25:08 +0000 (Wed, 02 Dec 2009)
> 
> Log Message:
> -----------
> [bp/r 23630, 23632][FIX]language: browser langauge must be limited to available language(ex: en_uk can be the browser language and not selected)
> 
> Modified Paths:
> --------------
>    branches/proposed/lib/tikilib.php
> 
> Modified: branches/proposed/lib/tikilib.php
> ===================================================================
> --- branches/proposed/lib/tikilib.php	2009-12-02 18:20:22 UTC (rev 23632)
> +++ branches/proposed/lib/tikilib.php	2009-12-02 18:25:08 UTC (rev 23633)
> @@ -8619,7 +8619,7 @@
> 
> 
> function detect_browser_language() {
> -
> +	global $prefs;
> 	// Get supported languages
> 	if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
> 		$supported = preg_split('/\s*,\s*/', preg_replace('/;q=[0-9.]+/','',$_SERVER['HTTP_ACCEPT_LANGUAGE']));
> @@ -8633,7 +8633,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.
> 
> ------------------------------------------------------------------------------
> Join us December 9, 2009 for the Red Hat Virtual Experience,
> a free event focused on virtualization and cloud computing. 
> Attend in-depth sessions from your desk. Your couch. Anywhere.
> http://p.sf.net/sfu/redhat-sfdev2dev
> _______________________________________________
> Tikiwiki-cvs mailing list
> Tik...@li...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs