mikuli.cz

commit d85d28b13d9bceec5995fb448751434acdb2565c
parent 7867ae270dceb74a500e639da1f2128a3df442d3
Author: markseu <mark2011@mayberg.se>
Date:   Wed, 16 Mar 2016 16:25:08 +0100

System update (developers cut)

Diffstat:
A
media/images/picture.jpg
 | 
0

M
system/plugins/core.php
 | 
5
+++--
R
media/images/icon.png -> system/themes/icon.png
 | 
0

3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/media/images/picture.jpg b/media/images/picture.jpg
Binary files differ.
diff --git a/system/plugins/core.php b/system/plugins/core.php
@@ -288,6 +288,7 @@ class YellowCore
 				$fileName = $this->config->get("configDir").$this->config->get("robotsFile");
 			}
 		}
+		if($location == "/favicon.ico") $fileName = $this->config->get("themeDir").$this->config->get("iconFile");
 		if(empty($fileName)) $fileName = $this->lookup->findFileFromLocation($location);
 		return array($serverScheme, $serverName, $base, $location, $fileName);
 	}
@@ -794,10 +795,10 @@ class YellowPage
 				$this->yellow->config->get("themeLocation").$this->get("theme").".js";
 				$output .= "<script type=\"text/javascript\" src=\"".htmlspecialchars($location)."\"></script>\n";
 			}
-			if(is_file($this->yellow->config->get("imageDir").$this->yellow->config->get("iconFile")))
+			if(is_file($this->yellow->config->get("themeDir").$this->yellow->config->get("iconFile")))
 			{
 				$location = $this->yellow->config->get("serverBase").
-				$this->yellow->config->get("imageLocation").$this->yellow->config->get("iconFile");
+				$this->yellow->config->get("themeLocation").$this->yellow->config->get("iconFile");
 				$contentType = $this->yellow->toolbox->getMimeContentType($this->yellow->config->get("iconFile"));
 				$output .= "<link rel=\"shortcut icon\" type=\"$contentType\" href=\"".htmlspecialchars($location)."\" />\n";
 			}
diff --git a/media/images/icon.png b/system/themes/icon.png
Binary files differ.