Merge pull request #4502 from smanzi/fix-#4421

Fixes for a regression introduced by #4221
joomla · Oct 10, 2014 · 89675ff · 89675ff
2 parents f450b30 + cab10af
commit 89675ff
Showing 1 changed file with 9 additions and 18 deletions.
diff --git a/plugins/system/languagefilter/languagefilter.php b/plugins/system/languagefilter/languagefilter.php
@@ -637,13 +637,10 @@ public function onAfterDispatch()
 						// Check if language is the default site language and remove url language code is on
 						if ($language->sef == self::$default_sef && $this->params->get('remove_default_prefix') == '1')
 						{
-							$relLink = str_replace('/' . $language->sef, '', $link);
-							$doc->addHeadLink($server . $relLink, 'alternate', 'rel', array('hreflang' => $language->lang_code));
-						}
-						else
-						{
-							$doc->addHeadLink($server . $link, 'alternate', 'rel', array('hreflang' => $language->lang_code));
+							$link = preg_replace('|/' . $language->sef . '/|', '/', $link, 1);
 						}
+
+						$doc->addHeadLink($server . $link, 'alternate', 'rel', array('hreflang' => $language->lang_code));
 					}
 					elseif (isset($associations[$language->lang_code]))
 					{
@@ -663,13 +660,10 @@ public function onAfterDispatch()
 							// Check if language is the default site language and remove url language code is on
 							if ($language->sef == self::$default_sef && $this->params->get('remove_default_prefix') == '1')
 							{
-								$relLink = str_replace('/' . $language->sef, '', $link);
-								$doc->addHeadLink($server . $relLink, 'alternate', 'rel', array('hreflang' => $language->lang_code));
-							}
-							else
-							{
-								$doc->addHeadLink($server . $link, 'alternate', 'rel', array('hreflang' => $language->lang_code));
+								$link = preg_replace('|/' . $language->sef . '/|', '/', $link, 1);
 							}
+
+							$doc->addHeadLink($server . $link, 'alternate', 'rel', array('hreflang' => $language->lang_code));
 						}
 					}
 				}
@@ -700,13 +694,10 @@ public function onAfterDispatch()
 						// Check if language is the default site language and remove url language code is on
 						if ($language->sef == self::$default_sef && $this->params->get('remove_default_prefix') == '1')
 						{
-							$relLink = str_replace('/' . $language->sef, '', $link);
-							$doc->addHeadLink($server . $relLink, 'alternate', 'rel', array('hreflang' => $language->lang_code));
-						}
-						else
-						{
-							$doc->addHeadLink($server . $link, 'alternate', 'rel', array('hreflang' => $language->lang_code));
+							$link = preg_replace('|/' . $language->sef . '/|', '/', $link, 1);
 						}
+
+						$doc->addHeadLink($server . $link, 'alternate', 'rel', array('hreflang' => $language->lang_code));
 					}
 				}
 			}