diff --git a/phpDoc/master/classes/AbstractPicoPlugin.html b/phpDoc/master/classes/AbstractPicoPlugin.html index 6736ec0..9427b8e 100644 --- a/phpDoc/master/classes/AbstractPicoPlugin.html +++ b/phpDoc/master/classes/AbstractPicoPlugin.html @@ -136,10 +136,10 @@
- + \
-
+
@@ -892,7 +892,7 @@ This parameter is optional and defaults to false.

Documentation is powered by phpDocumentor and authored - on October 29th, 2015 at 18:14. + on November 3rd, 2015 at 16:05.
diff --git a/phpDoc/master/classes/DummyPlugin.html b/phpDoc/master/classes/DummyPlugin.html index da9f9c7..f55f605 100644 --- a/phpDoc/master/classes/DummyPlugin.html +++ b/phpDoc/master/classes/DummyPlugin.html @@ -136,10 +136,10 @@
- + \
-
+
@@ -1699,7 +1699,7 @@ structure of the page data.

Documentation is powered by phpDocumentor and authored - on October 29th, 2015 at 18:14. + on November 3rd, 2015 at 16:05.
diff --git a/phpDoc/master/classes/Pico.html b/phpDoc/master/classes/Pico.html index 15a0c1e..b48a418 100644 --- a/phpDoc/master/classes/Pico.html +++ b/phpDoc/master/classes/Pico.html @@ -136,10 +136,10 @@
- + \
-
+
@@ -2400,7 +2400,7 @@ or Pico::SORT_NONE to leave the result unsorted

Documentation is powered by phpDocumentor and authored - on October 29th, 2015 at 18:14. + on November 3rd, 2015 at 16:05.
diff --git a/phpDoc/master/classes/PicoPluginInterface.html b/phpDoc/master/classes/PicoPluginInterface.html index 3f4461f..324683f 100644 --- a/phpDoc/master/classes/PicoPluginInterface.html +++ b/phpDoc/master/classes/PicoPluginInterface.html @@ -136,10 +136,10 @@
- + \
-
+
@@ -600,7 +600,7 @@ This parameter is optional and defaults to false.

Documentation is powered by phpDocumentor and authored - on October 29th, 2015 at 18:14. + on November 3rd, 2015 at 16:05.
diff --git a/phpDoc/master/files/index.html b/phpDoc/master/files/index.html index bad51fc..7eb9269 100644 --- a/phpDoc/master/files/index.html +++ b/phpDoc/master/files/index.html @@ -136,10 +136,10 @@
- + \
-
+
@@ -238,7 +238,7 @@
Documentation is powered by phpDocumentor and authored - on October 29th, 2015 at 18:14. + on November 3rd, 2015 at 16:05.
diff --git a/phpDoc/master/files/lib.AbstractPicoPlugin.html b/phpDoc/master/files/lib.AbstractPicoPlugin.html index a4ed530..9438143 100644 --- a/phpDoc/master/files/lib.AbstractPicoPlugin.html +++ b/phpDoc/master/files/lib.AbstractPicoPlugin.html @@ -136,10 +136,10 @@
- + \
-
+
@@ -245,7 +245,7 @@
Documentation is powered by phpDocumentor and authored - on October 29th, 2015 at 18:14. + on November 3rd, 2015 at 16:05.
diff --git a/phpDoc/master/files/lib.Pico.html b/phpDoc/master/files/lib.Pico.html index 9a5b7dd..2a0b3a5 100644 --- a/phpDoc/master/files/lib.Pico.html +++ b/phpDoc/master/files/lib.Pico.html @@ -136,10 +136,10 @@
- + \
-
+
@@ -245,7 +245,7 @@
Documentation is powered by phpDocumentor and authored - on October 29th, 2015 at 18:14. + on November 3rd, 2015 at 16:05.
diff --git a/phpDoc/master/files/lib.PicoPluginInterface.html b/phpDoc/master/files/lib.PicoPluginInterface.html index c043baf..aeb6559 100644 --- a/phpDoc/master/files/lib.PicoPluginInterface.html +++ b/phpDoc/master/files/lib.PicoPluginInterface.html @@ -136,10 +136,10 @@
- + \
-
+
@@ -245,7 +245,7 @@
Documentation is powered by phpDocumentor and authored - on October 29th, 2015 at 18:14. + on November 3rd, 2015 at 16:05.
diff --git a/phpDoc/master/files/lib/Pico.php.txt b/phpDoc/master/files/lib/Pico.php.txt index bc03e0a..18c2a05 100644 --- a/phpDoc/master/files/lib/Pico.php.txt +++ b/phpDoc/master/files/lib/Pico.php.txt @@ -427,6 +427,7 @@ class Pico */ protected function loadConfig() { + $config = null; $defaultConfig = array( 'site_title' => 'Pico', 'base_url' => '', @@ -436,13 +437,15 @@ class Pico 'twig_config' => array('cache' => false, 'autoescape' => false, 'debug' => false), 'pages_order_by' => 'alpha', 'pages_order' => 'asc', - 'content_dir' => $this->getRootDir() . 'content-sample/', + 'content_dir' => null, 'content_ext' => '.md', 'timezone' => '' ); $configFile = $this->getConfigDir() . 'config.php'; - $config = file_exists($configFile) ? require($configFile) : null; + if (file_exists($configFile)) { + require $configFile; + } $this->config = is_array($this->config) ? $this->config : array(); $this->config += is_array($config) ? $config + $defaultConfig : $defaultConfig; @@ -450,7 +453,14 @@ class Pico if (empty($this->config['base_url'])) { $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']); } if (!empty($this->config['timezone'])) { diff --git a/phpDoc/master/files/plugins.DummyPlugin.html b/phpDoc/master/files/plugins.DummyPlugin.html index 2fe15c8..33a23e0 100644 --- a/phpDoc/master/files/plugins.DummyPlugin.html +++ b/phpDoc/master/files/plugins.DummyPlugin.html @@ -136,10 +136,10 @@
- + \
-
+
@@ -245,7 +245,7 @@
Documentation is powered by phpDocumentor and authored - on October 29th, 2015 at 18:14. + on November 3rd, 2015 at 16:05.
diff --git a/phpDoc/master/graphs/class.html b/phpDoc/master/graphs/class.html index 571e3b6..b3c51ef 100644 --- a/phpDoc/master/graphs/class.html +++ b/phpDoc/master/graphs/class.html @@ -152,7 +152,7 @@
Documentation is powered by phpDocumentor and authored - on October 29th, 2015 at 18:14. + on November 3rd, 2015 at 16:05.
diff --git a/phpDoc/master/index.html b/phpDoc/master/index.html index 4a10bae..36c5497 100644 --- a/phpDoc/master/index.html +++ b/phpDoc/master/index.html @@ -88,10 +88,10 @@
- + \
-
+
@@ -195,7 +195,7 @@
Documentation is powered by phpDocumentor and authored - on October 29th, 2015 at 18:14. + on November 3rd, 2015 at 16:05.
diff --git a/phpDoc/master/namespaces/default.html b/phpDoc/master/namespaces/default.html index 0c4d902..1a4f5f5 100644 --- a/phpDoc/master/namespaces/default.html +++ b/phpDoc/master/namespaces/default.html @@ -88,10 +88,10 @@
- + \
-
+
@@ -195,7 +195,7 @@
Documentation is powered by phpDocumentor and authored - on October 29th, 2015 at 18:14. + on November 3rd, 2015 at 16:05.
diff --git a/phpDoc/master/reports/deprecated.html b/phpDoc/master/reports/deprecated.html index 25194f5..55b3b75 100644 --- a/phpDoc/master/reports/deprecated.html +++ b/phpDoc/master/reports/deprecated.html @@ -142,7 +142,7 @@
Documentation is powered by phpDocumentor and authored - on October 29th, 2015 at 18:14. + on November 3rd, 2015 at 16:05.
diff --git a/phpDoc/master/reports/errors.html b/phpDoc/master/reports/errors.html index 9b79d24..b910765 100644 --- a/phpDoc/master/reports/errors.html +++ b/phpDoc/master/reports/errors.html @@ -89,10 +89,10 @@
@@ -104,32 +104,6 @@ -
- -

- - plugins/DummyPlugin.php - 1 -

-
- - - - - - - - - - - - - - - -
TypeLineDescription
error0PPC:ERR-50000
-
-

@@ -227,10 +201,10 @@

- +

- lib/Pico.php + lib/PicoPluginInterface.php 1

@@ -253,10 +227,36 @@
- +

- lib/PicoPluginInterface.php + plugins/DummyPlugin.php + 1 +

+
+ + + + + + + + + + + + + + + +
TypeLineDescription
error0PPC:ERR-50000
+
+
+
+ +

+ + lib/Pico.php 1

@@ -343,7 +343,7 @@
Documentation is powered by phpDocumentor and authored - on October 29th, 2015 at 18:14. + on November 3rd, 2015 at 16:05.
diff --git a/phpDoc/master/reports/markers.html b/phpDoc/master/reports/markers.html index fa3248c..68bd5b4 100644 --- a/phpDoc/master/reports/markers.html +++ b/phpDoc/master/reports/markers.html @@ -88,8 +88,8 @@
+
  • lib/Pico.php
    • +
    @@ -101,7 +101,7 @@
    -
    +

    @@ -123,7 +123,7 @@

    -
    +
    @@ -163,7 +163,7 @@
    Documentation is powered by phpDocumentor and authored - on October 29th, 2015 at 18:14. + on November 3rd, 2015 at 16:05.