Updated link.php & Stop loading font family if more then one

sumesh.kumar@joomdev.com · sumesh.kumar@joomdev.com · commit 26b4616b8237 · 2019-06-27T15:10:22.000+05:30
diff --git a/astroid/astroid-template-zero/frontend/header/menu/link.php b/astroid/astroid-template-zero/frontend/header/menu/link.php
@@ -103,6 +103,7 @@
    $validonepagelink = strpos($item->link,"#");
    if($validonepagelink == '0' && (strlen($item->link) > 1)){
       // Default we assume that you only want the one page for the homepage. If you want one page to work on other pages, please go ahead and hard code the full page URL i.e. https://yoursite.com/pageurl#onepageblockid
+      // $item->link = JURI::root().$item->link;
       $item->link = JURI::root().$item->link;
    }
 }
diff --git a/astroid/astroid-template-zero/frontend/typography.php b/astroid/astroid-template-zero/frontend/typography.php
@@ -168,7 +168,7 @@
 }
 
 // Let's add combined style sheet here
-$ast_fontfamily_list = implode("|", str_replace(" ", "+", $ast_fontfamily));
+$ast_fontfamily_list = implode("|", str_replace(" ", "+", array_unique($ast_fontfamily)));
 if ($in_head) {
    $document = JFactory::getDocument();
    if (!empty($ast_fontfamily_list)) {

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@`
`103`	`103`	`$validonepagelink = strpos($item->link,"#");`
`104`	`104`	`if($validonepagelink == '0' && (strlen($item->link) > 1)){`
`105`	`105`	`// Default we assume that you only want the one page for the homepage. If you want one page to work on other pages, please go ahead and hard code the full page URL i.e. https://yoursite.com/pageurl#onepageblockid`
	`106`	`+ // $item->link = JURI::root().$item->link;`
`106`	`107`	`$item->link = JURI::root().$item->link;`
`107`	`108`	`}`
`108`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`// Let's add combined style sheet here`
`171`		`-$ast_fontfamily_list = implode("\|", str_replace(" ", "+", $ast_fontfamily));`
	`171`	`+$ast_fontfamily_list = implode("\|", str_replace(" ", "+", array_unique($ast_fontfamily)));`
`172`	`172`	`if ($in_head) {`
`173`	`173`	`$document = JFactory::getDocument();`
`174`	`174`	`if (!empty($ast_fontfamily_list)) {`