From: <sy...@us...> - 2009-02-08 19:36:20
|
Revision: 16615 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=16615&view=rev Author: sylvieg Date: 2009-02-08 19:36:17 +0000 (Sun, 08 Feb 2009) Log Message: ----------- rollback 16611 unitl better fix - if fix is needed Modified Paths: -------------- trunk/lib/multilingual/multilinguallib.php trunk/templates/translated-lang.tpl trunk/tiki-index.php Modified: trunk/lib/multilingual/multilinguallib.php =================================================================== --- trunk/lib/multilingual/multilinguallib.php 2009-02-08 19:30:43 UTC (rev 16614) +++ trunk/lib/multilingual/multilinguallib.php 2009-02-08 19:36:17 UTC (rev 16615) @@ -225,13 +225,6 @@ global $user, $prefs, $tikilib; $langs = array(); - // If the user's preferred language is stored as a session variable, - // then make it the first element in the langs array. - if ( isset($_SESSION['prefLang']) ) - { - $langs[] = $_SESSION['prefLang'] ; - } - if ($langContext) { $langs[] = $langContext; if (strchr($langContext, "-")) // add en if en-uk Modified: trunk/templates/translated-lang.tpl =================================================================== --- trunk/templates/translated-lang.tpl 2009-02-08 19:30:43 UTC (rev 16614) +++ trunk/templates/translated-lang.tpl 2009-02-08 19:36:17 UTC (rev 16615) @@ -54,8 +54,6 @@ <option value="_translate_">{tr}Translate{/tr}</option> {/if} </select> - {* Hidden input to distinguish a selection from this list, from any other request. *} - <input type="hidden" name="userLanguageSelected" value="1"> </form> {/if} Modified: trunk/tiki-index.php =================================================================== --- trunk/tiki-index.php 2009-02-08 19:30:43 UTC (rev 16614) +++ trunk/tiki-index.php 2009-02-08 19:36:17 UTC (rev 16615) @@ -92,14 +92,11 @@ } else { $access->display_error( '', tra('No name indicated for wiki page')); } + if ($prefs['feature_best_language'] == 'y') { + $use_best_language = true; + } } -// Always choose the best language, unless the page has been selected from the -// dropdown language list, as indicated by the intut userLanguageSelected. -if ( ( !isset($_REQUEST['userLanguageSelected']) ) and ($prefs['feature_best_language'] == 'y') ) { - $use_best_language = true; -} - $structs_with_perm = array(); if( $prefs['feature_wiki_structure'] == 'y' ) { $structure = 'n'; @@ -194,12 +191,6 @@ if (!$info) $info = $tikilib->get_page_info($page); -// If the user has selected a language from the dropdown lise, then make -// the selected language the user's preferred language. -if ( isset($_REQUEST['userLanguageSelected']) ) -{ - $_SESSION['prefLang'] = $info['lang'] ; -} // If the page doesn't exist then display an error if(empty($info) && !($user && $prefs['feature_wiki_userpage'] == 'y' && strcasecmp($prefs['feature_wiki_userpage_prefix'].$user, $page) == 0)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |