SeaCMS/pico
3
0
Fork 0
Code Issues Pull Requests Activity

Sync config/config.yml.template with Pico::loadConfig()

Browse Source
This commit is contained in:
Daniel Rudolf 2019-07-14 16:16:57 +02:00
parent 8c8c6e33f7
commit c9a3f84673
No known key found for this signature in database
GPG Key ID: A061F02CD8DE4538
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.yml.template
View File

@ -6,7 +6,7 @@ base_url: ~ # Pico will try to guess its base URL, if th
# Example: https://example.com/pico/ # Example: https://example.com/pico/
rewrite_url: ~ # A boolean (true or false) indicating whether URL rewriting is forced rewrite_url: ~ # A boolean (true or false) indicating whether URL rewriting is forced
debug: ~ # Set this to true to enable Pico's debug mode debug: ~ # Set this to true to enable Pico's debug mode
timezone: UTC # Your PHP installation might require you to manually specify a timezone timezone: ~ # Your PHP installation might require you to manually specify a timezone
## ##
# Theme # Theme
@ -19,7 +19,7 @@ theme_config:
twig_config: twig_config:
autoescape: false # Let Twig escape variables by default autoescape: false # Let Twig escape variables by default
strict_variables: false # If set to true, Twig will bail out when unset variables are being used strict_variables: false # If set to true, Twig will bail out when unset variables are being used
debug: false # Enable Twig's debug mode debug: ~ # Enable Twig's debug mode
cache: false # Enable Twig template caching by specifying a path to a writable directory cache: false # Enable Twig template caching by specifying a path to a writable directory
auto_reload: ~ # Recompile Twig templates whenever the source code changes auto_reload: ~ # Recompile Twig templates whenever the source code changes

4
lib/Pico.php
View File

@ -910,7 +910,6 @@ class Pico
'rewrite_url' => null, 'rewrite_url' => null,
'debug' => null, 'debug' => null,
'timezone' => null, 'timezone' => null,
'plugins_url' => null,
'theme' => 'default', 'theme' => 'default',
'themes_url' => null, 'themes_url' => null,
'twig_config' => null, 'twig_config' => null,
@ -922,7 +921,8 @@ class Pico
'content_ext' => '.md', 'content_ext' => '.md',
'content_config' => null, 'content_config' => null,
'assets_dir' => 'assets/', 'assets_dir' => 'assets/',
'assets_url' => null 'assets_url' => null,
'plugins_url' => null
); );
if (!$this->config['base_url']) { if (!$this->config['base_url']) {