Search for content/index.md to determine the content dir to use

This commit is contained in:
Daniel Rudolf 2017-05-02 00:22:35 +02:00
parent bba93752cb
commit 1d73524e41
No known key found for this signature in database
GPG key ID: A061F02CD8DE4538

View file

@ -761,9 +761,9 @@ class Pico
if (!$this->config['content_dir']) { if (!$this->config['content_dir']) {
// try to guess the content directory // try to guess the content directory
if (is_dir($this->getRootDir() . 'content')) { if (is_file($this->getRootDir() . 'content/index' . $this->config['content_ext'])) {
$this->config['content_dir'] = $this->getRootDir() . 'content/'; $this->config['content_dir'] = $this->getRootDir() . 'content/';
} elseif (is_dir($this->getRootDir() . 'content-sample')) { } elseif (is_file($this->getRootDir() . 'content-sample/index' . $this->config['content_ext'])) {
$this->config['content_dir'] = $this->getRootDir() . 'content-sample/'; $this->config['content_dir'] = $this->getRootDir() . 'content-sample/';
} else { } else {
$this->config['content_dir'] = $this->getVendorDir() . 'content-sample/'; $this->config['content_dir'] = $this->getVendorDir() . 'content-sample/';