Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-15 21:22:46 +02:00
Code Issues Packages Projects Releases Activity

routable() now takes published() into account. Re issue #227

Browse Source
This commit is contained in:
Andy Miller
2015-07-17 17:31:36 -06:00
parent 0fd4991dd4
commit 0c0aa94ded
1 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
system/src/Grav/Common/Page/Page.php
View File

@@ -119,24 +119,7 @@ class Page
$this->url();
$this->visible();
$this->modularTwig($this->slug[0] == '_');
// Handle publishing dates if no explict published option set
if (self::getGrav()['config']->get('system.pages.publish_dates') && !isset($this->header->published)) {
// unpublish if required, if not clear cache right before page should be unpublished
if ($this->unpublishDate()) {
if ($this->unpublishDate() < time()) {
$this->published(false);
} else {
$this->published();
self::getGrav()['cache']->setLifeTime($this->unpublishDate());
}
}
// publish if required, if not clear cache right before page is published
if ($this->publishDate() != $this->modified() && $this->publishDate() > time()) {
$this->published(false);
self::getGrav()['cache']->setLifeTime($this->publishDate());
}
}
$this->setPublishState();
$this->published();
}
@@ -970,7 +953,8 @@ class Page
/**
* Gets and Sets whether or not this Page is routable, ie you can reach it
* via a URL
* via a URL.
* The page must be *routable* and *published*
*
* @param bool $var true if the page is routable
* @return bool true if the page is routable
@@ -980,7 +964,7 @@ class Page
if ($var !== null) {
$this->routable = (bool) $var;
}
return $this->routable;
return $this->routable && $this->published();
}
/**
@@ -1961,5 +1945,24 @@ class Page
$this->_original = null;
}
protected function setPublishState()
{
// Handle publishing dates if no explict published option set
if (self::getGrav()['config']->get('system.pages.publish_dates') && !isset($this->header->published)) {
// unpublish if required, if not clear cache right before page should be unpublished
if ($this->unpublishDate()) {
if ($this->unpublishDate() < time()) {
$this->published(false);
} else {
$this->published();
self::getGrav()['cache']->setLifeTime($this->unpublishDate());
}
}
// publish if required, if not clear cache right before page is published
if ($this->publishDate() != $this->modified() && $this->publishDate() > time()) {
$this->published(false);
self::getGrav()['cache']->setLifeTime($this->publishDate());
}
}
}
}