mirror/php-flextype
1
0
Fork 0
mirror of https://github.com/flextype/flextype.git synced 2025-08-08 14:16:46 +02:00
Code Issues Releases Wiki Activity

Pages class: use constant PAGES_PATH instead of CONTENT_PATH

Browse Source
This commit is contained in:
Awilum
2018-03-10 23:43:08 +03:00
parent edec1cfbca
commit 38d50a578a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rawilum/Pages.php
View File

@@ -46,13 +46,13 @@ class Pages
if ($url) {
$file = $url;
} else {
$file = PAGES_PATH . '/pages/' . $this->rawilum['config']->get('site.pages.main') . '/' . 'index.md';
$file = PAGES_PATH . '/' . $this->rawilum['config']->get('site.pages.main') . '/' . 'index.md';
}
} else {
if ($url) {
$file = PAGES_PATH . '/pages/' . $url . '/index.md';
$file = PAGES_PATH . '/' . $url . '/index.md';
} else {
$file = PAGES_PATH . '/pages/' . $this->rawilum['config']->get('site.pages.main') . '/' . 'index.md';
$file = PAGES_PATH . '/' . $this->rawilum['config']->get('site.pages.main') . '/' . 'index.md';
}
}
@@ -60,7 +60,7 @@ class Pages
if ($this->rawilum['filesystem']->exists($file)) {
$file = $file;
} else {
$file = PAGES_PATH . '/pages/404/index.md';
$file = PAGES_PATH . '/404/index.md';
Response::status(404);
}
@@ -97,7 +97,7 @@ class Pages
$content = $page[2];
// @TODO fix this!
$url = str_replace(PAGES_PATH . '/pages', Url::getBase(), $file);
$url = str_replace(PAGES_PATH, Url::getBase(), $file);
$url = str_replace('index.md', '', $url);
$url = str_replace('.md', '', $url);
$url = str_replace('\\', '/', $url);
@@ -138,7 +138,7 @@ class Pages
public function getPages($url = '', $raw = false, $order_by = 'date', $order_type = 'DESC', $ignore = ['404', 'index'], $limit = null)
{
// Get pages list for current $url
$pages_list = $this->rawilum['finder']->files()->name('*.md')->in(PAGES_PATH . '/pages/' . $url);
$pages_list = $this->rawilum['finder']->files()->name('*.md')->in(PAGES_PATH . '/' . $url);
// Go trough pages list
foreach ($pages_list as $key => $page) {