diff options
| author | vdigital <vdigital@piwigo.org> | 2009-06-30 21:24:55 +0000 |
|---|---|---|
| committer | vdigital <vdigital@piwigo.org> | 2009-06-30 21:24:55 +0000 |
| commit | 731cb8940c2fe220f2d1b5ea16abc3a594746b21 (patch) | |
| tree | 13ceb697ad342cfdd1b437fe916e218e49076673 /plugins/language_switch/flags.tpl | |
| parent | 73680f6348954359cef534cf5fc7e7a21c0b7de4 (diff) | |
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
$conf['question_mark_in_urls']
$conf['php_extension_in_urls']
=> BUT force a return to home in some cases.
+ Full technical code review
git-svn-id: http://piwigo.org/svn/trunk@3479 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | plugins/language_switch/flags.tpl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/language_switch/flags.tpl b/plugins/language_switch/flags.tpl index 7a30553ee..06d438550 100644 --- a/plugins/language_switch/flags.tpl +++ b/plugins/language_switch/flags.tpl @@ -17,7 +17,7 @@ <ul class="flag-pan"> {foreach from=$lang_switch.flags key=code item=flag name=f} <li> - <a rel="nofollow" href="{$flag.url}"> + <a rel="nofollow" href="{$SCRIPT_NAME}{$flag.url}"> <img class="flags" src="{$flag.img}" alt="{$flag.alt}" title="{$flag.alt}"/> </a> </li> @@ -35,14 +35,14 @@ </li> {html_head} {if $themeconf.template=='yoga' and $themeconf.theme=='Sylvia'} -<link rel="stylesheet" type="text/css" href="{$LANGUAGE_SWITCH_PATH|@cat:'language_switch.css'}"> +<link rel="stylesheet" type="text/css" href="{$ROOT_URL}{$LANGUAGE_SWITCH_PATH|@cat:'language_switch.css'}"> {else} -<link rel="stylesheet" type="text/css" href="{$LANGUAGE_SWITCH_PATH|@cat:'language_switch-default.css'}"> +<link rel="stylesheet" type="text/css" href="{$ROOT_URL}{$LANGUAGE_SWITCH_PATH|@cat:'language_switch-default.css'}"> {/if} {if Componant_exists($LANGUAGE_SWITCH_PATH, 'language_switch-local.css')} -<link rel="stylesheet" type="text/css" href="{$LANGUAGE_SWITCH_PATH|@cat:'language_switch-local.css'}"> +<link rel="stylesheet" type="text/css" href="{$ROOT_URL}{$LANGUAGE_SWITCH_PATH|@cat:'language_switch-local.css'}"> {/if} <!--[if lte IE 6]> -<link rel="stylesheet" type="text/css" href="{$LANGUAGE_SWITCH_PATH|@cat:'language_switch-ie6.css'}"> +<link rel="stylesheet" type="text/css" href="{$ROOT_URL}{$LANGUAGE_SWITCH_PATH|@cat:'language_switch-ie6.css'}"> <![endif]--> {/html_head}
\ No newline at end of file |