aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/language_switch
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-09-08 10:46:35 +0000
committerplegall <plg@piwigo.org>2011-09-08 10:46:35 +0000
commitff46db430bd2aa265c16bbd6ff17e0bae710d332 (patch)
tree32b7a7cbf4a8c01901bb00a2592dd450c047f717 /plugins/language_switch
parent9252e5cb2d0cb9a5b2943049e8bb813285d40cd3 (diff)
feature 2431: only keep MySQL on installation form
git-svn-id: http://piwigo.org/svn/trunk@12103 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'plugins/language_switch')
-rw-r--r--plugins/language_switch/flags.tpl2
-rw-r--r--plugins/language_switch/language_switch.inc.php16
2 files changed, 11 insertions, 7 deletions
diff --git a/plugins/language_switch/flags.tpl b/plugins/language_switch/flags.tpl
index 9bf88dba6..3add5c1a2 100644
--- a/plugins/language_switch/flags.tpl
+++ b/plugins/language_switch/flags.tpl
@@ -19,7 +19,7 @@
{foreach from=$lang_switch.flags key=code item=flag name=f}
<li>
- <a rel="nofollow" href="{$SCRIPT_NAME}{$flag.url}">
+ <a rel="nofollow" href="{$flag.url}">
<img class="flags" src="{$flag.img}" alt="{$flag.alt}" title="{$flag.alt}"/> {$flag.title}
</a>
</li>
diff --git a/plugins/language_switch/language_switch.inc.php b/plugins/language_switch/language_switch.inc.php
index a1d85a4ca..3f782e1f7 100644
--- a/plugins/language_switch/language_switch.inc.php
+++ b/plugins/language_switch/language_switch.inc.php
@@ -100,15 +100,19 @@ UPDATE '.USER_INFOS_TABLE.'
}
$url_starting = get_query_string_diff(array('lang'));
+
+ echo htmlspecialchars($url_starting).'<br>';
foreach ($available_lang as $code => $displayname)
{
- $qlc = array (
- 'url' => str_replace(
- array('=&amp;','?&amp;'),
- array('&amp;','?'),
- add_url_params($url_starting, array('lang'=> $code))
- ),
+ $qlc = array (
+ // 'url' => duplicate_index_url().'&amp;lang='.$code,
+ 'url' => add_url_params(duplicate_index_url(), array('lang'=> $code)),
+ // 'url' => str_replace(
+ // array('=&amp;','?&amp;'),
+ // array('&amp;','?'),
+ // add_url_params($url_starting, array('lang'=> $code))
+ // ),
'alt' => ucwords($displayname),
'title' => substr($displayname, 0, -4), // remove [FR] or [RU]
'img' => get_root_url().'language/'.$code.'/'.$code.'.jpg',