mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 05:07:27 +02:00
Code Issues Releases Wiki Activity

Fix for duplicate e_MENU lans in query.

Browse Source
This commit is contained in:
Cameron
2013-11-06 17:47:58 -08:00
parent 6265b1e48c
commit 474df4948e
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
e107_core/shortcodes/single/languagelinks.php
View File

@@ -96,23 +96,38 @@ function languagelinks_shortcode($parm = '')
{ {
$code = ($languageFolder == e107::getPref('sitelanguage')) ? 'www' : $code; $code = ($languageFolder == e107::getPref('sitelanguage')) ? 'www' : $code;
if(LANGLINKS_HOME) if(LANGLINKS_HOME)
{
$link = str_replace($_SERVER['HTTP_HOST'], $code.'.'.e_DOMAIN, SITEURL); $link = str_replace($_SERVER['HTTP_HOST'], $code.'.'.e_DOMAIN, SITEURL);
}
else else
{
$link = (!LANGLINKS_NOQUERY) $link = (!LANGLINKS_NOQUERY)
? str_replace($_SERVER['HTTP_HOST'], $code.'.'.e_DOMAIN, e_REQUEST_URL) // includes query string ? str_replace($_SERVER['HTTP_HOST'], $code.'.'.e_DOMAIN, e_REQUEST_URL) // includes query string
: str_replace($_SERVER['HTTP_HOST'], $code.'.'.e_DOMAIN, e_REQUEST_SELF); // excludes query string : str_replace($_SERVER['HTTP_HOST'], $code.'.'.e_DOMAIN, e_REQUEST_SELF); // excludes query string
}
} }
else else
{ {
// TODO - switch to elan=Language query when possible (now it'll break the old DOT query string format) // TODO - switch to elan=Language query when possible (now it'll break the old DOT query string format)
if(LANGLINKS_HOME) if(LANGLINKS_HOME)
{
$link = SITEURL.'?elan='.$languageFolder; $link = SITEURL.'?elan='.$languageFolder;
}
else else
$link = (!LANGLINKS_NOQUERY) ? e_REQUEST_SELF.'?['.$code.']'.e_QUERY : e_REQUEST_SELF.'?elan='.$languageFolder; {
$e_QUERY = str_replace('['.e_MENU.']',"",e_QUERY);
$link = (!LANGLINKS_NOQUERY) ? e_REQUEST_SELF.'?['.$code.']'.$e_QUERY : e_REQUEST_SELF.'?elan='.$languageFolder;
}
} }
$class = ($languageFolder == e_LANGUAGE) ? 'languagelink_active' : 'languagelink'; $class = ($languageFolder == e_LANGUAGE) ? 'languagelink_active' : 'languagelink';
$ret[] = "\n<a class='{$class}' href='{$link}'>{$name}</a>"; $ret[] = "\n<a class='{$class}' href='{$link}'>{$name}</a>";
} }
return implode(LANGLINKS_SEPARATOR, $ret); return implode(LANGLINKS_SEPARATOR, $ret);
} }