Merge pull request #573 from topcoder-platform/issues-572

jmgasper · web-flow · commit d14d66ddf2d7 · 2021-04-14T07:24:41.000+10:00
Issues-572: Fixed Favicon path
diff --git a/config/vanilla/config.php b/config/vanilla/config.php
@@ -205,3 +205,5 @@
 ];
 // Allow "target='_blank'" for Markdown format;
 $Configuration['Garden']['Html']['BlockedAttributes']='on*, download';
+
+$Configuration['Garden']['FavIcon']='/themes/topcoder/design/images/favicon.png';
diff --git a/vanilla/library/core/class.controller.php b/vanilla/library/core/class.controller.php
@@ -1975,7 +1975,7 @@ public function renderMaster() {
             // Add the favicon.
             $Favicon = c('Garden.FavIcon');
             if ($Favicon) {
-                $this->Head->setFavIcon(Gdn_Upload::url($Favicon));
+                $this->Head->setFavIcon($Favicon);
             }
 
             $touchIcon = c('Garden.TouchIcon');

Original file line number	Diff line number	Diff line change
`@@ -1975,7 +1975,7 @@ public function renderMaster() {`
`1975`	`1975`	`// Add the favicon.`
`1976`	`1976`	`$Favicon = c('Garden.FavIcon');`
`1977`	`1977`	`if ($Favicon) {`
`1978`		`- $this->Head->setFavIcon(Gdn_Upload::url($Favicon));`
	`1978`	`+ $this->Head->setFavIcon($Favicon);`
`1979`	`1979`	`}`
`1980`	`1980`
`1981`	`1981`	`$touchIcon = c('Garden.TouchIcon');`