beenull/yellow
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Core update (no title support)

Browse source
This commit is contained in:
markseu 2015-01-22 13:26:21 +01:00
parent a8129ca13a
commit a71fcc1a1f
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -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)

5
system/core/core.php
View file

@ -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));