mikuli.cz

commit a71fcc1a1f2f85bcb8488b9525f3886badd5cd90
parent a8129ca13a5136fe65572a55d7173f8fc99b8046
Author: markseu <mark2011@mayberg.se>
Date:   Thu, 22 Jan 2015 13:26:21 +0100

Core update (no title support)

Diffstat:
M
README.md
 | 
2
+-
M
system/core/core.php
 | 
5
+++--

2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Yellow 0.4.20
+Yellow 0.4.21
 =============
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/markseu/yellowcms) 
 
diff --git a/system/core/core.php b/system/core/core.php
@@ -5,7 +5,7 @@
 // Yellow main class
 class Yellow
 {
-	const Version = "0.4.20";
+	const Version = "0.4.21";
 	var $page;				//current page
 	var $pages;				//pages from file system
 	var $config;			//configuration
@@ -519,9 +519,10 @@ class YellowPage
 		
 		$shortHeader = $this->location == $this->yellow->pages->getHomeLocation($this->location);
 		$titleHeader = $shortHeader ? $this->get("sitename") : $this->get("title")." - ".$this->get("sitename");
+		if($this->get("titleContent") == "-") $this->set("titleContent", "");
+		if(!$this->isExisting("titleContent")) $this->set("titleContent", $this->get("title"));
 		if(!$this->isExisting("titleHeader")) $this->set("titleHeader", $titleHeader);
 		if(!$this->isExisting("titleNavigation")) $this->set("titleNavigation", $this->get("title"));
-		if(!$this->isExisting("titleContent")) $this->set("titleContent", $this->get("title"));
 		$this->set("pageRead", $this->yellow->toolbox->getUrl(
 			$this->yellow->config->get("serverScheme"), $this->yellow->config->get("serverName"),
 			$this->yellow->config->get("serverBase"), $this->location));