diff --git a/phpDoc/master/classes/AbstractPicoPlugin.html b/phpDoc/master/classes/AbstractPicoPlugin.html index 6736ec035a830f972f1a0a655632a1d7f09095bb..9427b8ea89e5e32323bce23cd780019b3480840f 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 da9f9c77b03730aa54af0f3e7f9d706980cd3ebc..f55f605177ff99dc18c0577e3be230d8c5ef545d 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 15a0c1ec03c03a4f22ba3e431574f89c7b470dc2..b48a418a7b6ef51d2108caa6a34d45071fc6f8a8 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 3f4461f58f2bca5055da757f064639e919bc91c0..324683fc8802a43613b41b48d85dea5b99af9324 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 bad51fc25395e27ca932b2f9a3c81056ef9f1107..7eb9269dc7a25525e98bd6bcbd3453412f6bb9d4 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 a4ed530484fbb2db7d75e67ded246c3f742bd352..94381439f2edf1753b8999cf264c7c894fb75ad3 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 9a5b7dd510f97bfb3fe8ba239921814117e54f89..2a0b3a5346a96e22a10e0e3bf075508c21889480 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 c043baf24b7fff96fb8688634312397c09af9392..aeb655913ceafbc85dbc963fdea934d75e81c722 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 bc03e0abe652a669b2830aa16b82ff61143285ad..18c2a05d064f7b524c4fb8096f9627694452f25b 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 2fe15c84835b9e7845befe674e2be22aaeec42c1..33a23e0cbadd6983e776d8119151aad4e6735a69 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 571e3b6d7d051aee62140f3ffc8d2c9970848de7..b3c51ef547f231cd91e4f3097ea7d1e6f8e77b54 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 4a10bae7994428bda8be08e0a21ba0c85fe18a5c..36c5497a21bb3db4ce4cd608e593f4877e264601 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 0c4d902c54855c49b63d3d211064cd89af8cc30a..1a4f5f5a4eef889354aa7161bb493313bf7d6e43 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 25194f588129264f1c41ed6455770470b6e8ece4..55b3b75706fac54f12bd607649a3fa8360266063 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 9b79d240f0f4a4dd81f3ee8a212b498d966e1558..b910765e051249cf5a6a8499c56dd0c75b2af1bf 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 fa3248c512766157f037efd8a2a40b586139bdfb..68bd5b4335f309af269c1b181afe84c21c52c3b7 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.