Merge pull request #2671 from infograf768/multilang25x

javigomez · javigomez · commit c6a86117e0aa · 2013-12-12T11:29:06.000-08:00
# Multilingual: solving 404 when Remove URL Language Code is set to YES (2.5.x)
diff --git a/plugins/system/languagefilter/languagefilter.php b/plugins/system/languagefilter/languagefilter.php
@@ -246,7 +246,7 @@ public function parseRule(&$router, &$uri)
 					// redirect if sef does not exists and language is not the default one
 					if (!isset(self::$sefs[$sef]) && $lang_code != self::$default_lang)
 					{
-						$sef = isset(self::$lang_codes[$lang_code]) ? self::$lang_codes[$lang_code]->sef : self::$default_sef;
+						$sef = isset(self::$lang_codes[$lang_code]) && empty($path) ? self::$lang_codes[$lang_code]->sef : self::$default_sef;
 						$uri->setPath($sef . '/' . $path);
 
 						if ($app->getCfg('sef_rewrite')) {

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ public function parseRule(&$router, &$uri)`
`246`	`246`	`// redirect if sef does not exists and language is not the default one`
`247`	`247`	`if (!isset(self::$sefs[$sef]) && $lang_code != self::$default_lang)`
`248`	`248`	`{`
`249`		`- $sef = isset(self::$lang_codes[$lang_code]) ? self::$lang_codes[$lang_code]->sef : self::$default_sef;`
	`249`	`+ $sef = isset(self::$lang_codes[$lang_code]) && empty($path) ? self::$lang_codes[$lang_code]->sef : self::$default_sef;`
`250`	`250`	`$uri->setPath($sef . '/' . $path);`
`251`	`251`
`252`	`252`	`if ($app->getCfg('sef_rewrite')) {`