Ignore:
Timestamp:
Jun 30, 2009, 11:24:55 PM (15 years ago)
Author:
vdigital
Message:

merge r3477 from branch 2.0 to trunk
Bug 964 fixed and more

+ ?&lang=en_UK" => ?lang=en_UK"
+ =&lang=en_UK" => &lang=en_UK"
+ Works for any combinations of
$confquestion_mark_in_urls
$confphp_extension_in_urls
=> BUT force a return to home in some cases.
+ Full technical code review

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/plugins/language_switch/flags.tpl

    r3369 r3479  
    1818                                                                        {foreach from=$lang_switch.flags key=code item=flag name=f}
    1919                                                                                <li>
    20                                                                                         <a rel="nofollow" href="{$flag.url}">
     20                                                                                        <a rel="nofollow" href="{$SCRIPT_NAME}{$flag.url}">
    2121                                                                                                <img class="flags" src="{$flag.img}" alt="{$flag.alt}" title="{$flag.alt}"/>
    2222                                                                                        </a>
     
    3636{html_head}
    3737{if $themeconf.template=='yoga' and $themeconf.theme=='Sylvia'}
    38 <link rel="stylesheet" type="text/css" href="{$LANGUAGE_SWITCH_PATH|@cat:'language_switch.css'}">
     38<link rel="stylesheet" type="text/css" href="{$ROOT_URL}{$LANGUAGE_SWITCH_PATH|@cat:'language_switch.css'}">
    3939{else}
    40 <link rel="stylesheet" type="text/css" href="{$LANGUAGE_SWITCH_PATH|@cat:'language_switch-default.css'}">
     40<link rel="stylesheet" type="text/css" href="{$ROOT_URL}{$LANGUAGE_SWITCH_PATH|@cat:'language_switch-default.css'}">
    4141{/if}
    4242{if Componant_exists($LANGUAGE_SWITCH_PATH, 'language_switch-local.css')}
    43 <link rel="stylesheet" type="text/css" href="{$LANGUAGE_SWITCH_PATH|@cat:'language_switch-local.css'}">
     43<link rel="stylesheet" type="text/css" href="{$ROOT_URL}{$LANGUAGE_SWITCH_PATH|@cat:'language_switch-local.css'}">
    4444{/if}
    4545<!--[if lte IE 6]>
    46 <link rel="stylesheet" type="text/css" href="{$LANGUAGE_SWITCH_PATH|@cat:'language_switch-ie6.css'}">
     46<link rel="stylesheet" type="text/css" href="{$ROOT_URL}{$LANGUAGE_SWITCH_PATH|@cat:'language_switch-ie6.css'}">
    4747<![endif]-->
    4848{/html_head}
Note: See TracChangeset for help on using the changeset viewer.