0ct0pu5/Pico
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Guess content directory

Browse source 
As pointed out by @Lomanic (see https://github.com/picocms/Pico/pull/260#issuecomment-153091890; thank you btw\!) we actually have to explain users how to change the content directory. This runs contrary to our "stupidly simple" claim. So Pico now simply uses the `content` directory when it exists...
This commit is contained in:
Daniel Rudolf 2015-11-02 19:48:58 +01:00
parent 2597e0dd91
commit ebe007bd78
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/Pico.php
View file

@ -437,7 +437,7 @@ class Pico
'twig_config' => array('cache' => false, 'autoescape' => false, 'debug' => false), 'twig_config' => array('cache' => false, 'autoescape' => false, 'debug' => false),
'pages_order_by' => 'alpha', 'pages_order_by' => 'alpha',
'pages_order' => 'asc', 'pages_order' => 'asc',
'content_dir' => $this->getRootDir() . 'content-sample/', 'content_dir' => null,
'content_ext' => '.md', 'content_ext' => '.md',
'timezone' => '' 'timezone' => ''
); );
@ -453,7 +453,14 @@ class Pico
if (empty($this->config['base_url'])) { if (empty($this->config['base_url'])) {
$this->config['base_url'] = $this->getBaseUrl(); $this->config['base_url'] = $this->getBaseUrl();
} }
if (!empty($this->config['content_dir'])) { if (empty($this->config['content_dir'])) {
// try to guess the content directory
if (is_dir($this->getRootDir() . 'content')) {
$this->config['content_dir'] = $this->getRootDir() . 'content/';
} else {
$this->config['content_dir'] = $this->getRootDir() . 'content-sample/';
}
} else {
$this->config['content_dir'] = $this->getAbsolutePath($this->config['content_dir']); $this->config['content_dir'] = $this->getAbsolutePath($this->config['content_dir']);
} }
if (!empty($this->config['timezone'])) { if (!empty($this->config['timezone'])) {