joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-27 07:33:41 +00:00
Code Packages Releases Activity

# [#27929] *Installing sample data and defining as site lang another

Browse Source 
lang then English breaks links. Thanks Christophe.
This commit is contained in:
chdemko 2012-02-01 09:40:32 +01:00 committed by Jean-Marie Simonet
parent ea97838c5e
commit 583948dd74
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/router.php
View File

@ -219,7 +219,7 @@ class JRouterSite extends JRouter
$item->language = trim($item->language);
}
$length = strlen($item->route); //get the length of the route
if ($length > 0 && JString::strpos($route_lowercase.'/', $item->route.'/') === 0 && $item->type != 'menulink' && ($item->language == '*' || $item->language == $lang_tag)) {
if ($length > 0 && JString::strpos($route_lowercase.'/', $item->route.'/') === 0 && $item->type != 'menulink' && (!$app->getLanguageFilter() || $item->language == '*' || $item->language == $lang_tag)) {
// We have exact item for this language
if ($item->language == $lang_tag) {
$found = $item;

3
installation/CHANGELOG
View File

@ -26,6 +26,9 @@ $ -> Language fix or change
- -> Removed
! -> Note
01-Feb-2012 Jean-Marie Simonet
# [#27929] *Installing sample data and defining as site lang another lang then English breaks links. Thanks Christophe.
31-Jan-2012 Christophe Demko
^ [#27905] Upgrade MooTools to version 1.4.3 (Rouven Weßling)
# [#27662] Can't update #__update_sites table at extension install on SQL Server (Michael Babker)