create alternate first for home pages

joomla · Mar 24, 2015 · 5ec776d · 5ec776d
1 parent 5a07b72
commit 5ec776d
Showing 1 changed file with 36 additions and 36 deletions.
diff --git a/plugins/system/languagefilter/languagefilter.php b/plugins/system/languagefilter/languagefilter.php
@@ -624,8 +624,42 @@ public function onAfterDispatch()
 				$assocs = array_merge(array_keys($cassociations), $assocs);
 			}
 
+			// Create alternate for home pages
+			if ($active && $active->home && $home)
+			{
+				foreach (JLanguageHelper::getLanguages() as $language)
+				{
+					if (!JLanguage::exists($language->lang_code))
+					{
+						continue;
+					}
+
+					$item = $menu->getDefault($language->lang_code);
+
+					if ($item && $item->language != $active->language && $item->language != '*')
+					{
+						if ($this->mode_sef)
+						{
+							$link = JRoute::_('index.php?Itemid=' . $item->id . '&lang=' . $language->sef);
+
+							// Check if language is the default site language and remove url language code is on
+							if ($language->sef == $this->lang_codes[JComponentHelper::getParams('com_languages')->get('site', 'en-GB')]->sef
+								&& $this->params->get('remove_default_prefix', 0))
+							{
+								$link = preg_replace('|/' . $language->sef . '/|', '/', $link, 1);
+							}
+						}
+						else
+						{
+							$link = JRoute::_($item->link . '&Itemid=' . $item->id . '&lang=' . $language->sef);
+						}
+
+						$doc->addHeadLink($server . $link, 'alternate', 'rel', array('hreflang' => $language->lang_code));
+					}
+				}
+			}
 			// Handle the default associations.
-			if ($this->params->get('item_associations') || ($active && $active->home && $home))
+			elseif ($this->params->get('item_associations'))
 			{
 				$languages = JLanguageHelper::getLanguages('lang_code');
 				foreach ($assocs as $language)
@@ -661,42 +695,8 @@ public function onAfterDispatch()
 						}
 					}
 				}
-
-				// Create alternate for home pages
-				if ($active && $active->home && $home)
-				{
-					foreach (JLanguageHelper::getLanguages() as $language)
-					{
-						if (!JLanguage::exists($language->lang_code))
-						{
-							continue;
-						}
-
-						$item = $menu->getDefault($language->lang_code);
-
-						if ($item && $item->language != $active->language && $item->language != '*')
-						{
-							if ($this->mode_sef)
-							{
-								$link = JRoute::_('index.php?Itemid=' . $item->id . '&lang=' . $language->sef);
-
-								// Check if language is the default site language and remove url language code is on
-								if ($language->sef == $this->lang_codes[JComponentHelper::getParams('com_languages')->get('site', 'en-GB')]->sef
-									&& $this->params->get('remove_default_prefix', 0))
-								{
-									$link = preg_replace('|/' . $language->sef . '/|', '/', $link, 1);
-								}
-							}
-							else
-							{
-								$link = JRoute::_($item->link . '&Itemid=' . $item->id . '&lang=' . $language->sef);
-							}
-
-							$doc->addHeadLink($server . $link, 'alternate', 'rel', array('hreflang' => $language->lang_code));
-						}
-					}
-				}
 			}
+
 		}
 	}