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

Force trailing slash of $config['base_url'] and force existance of $config['timezone']

Browse Source
This commit is contained in:
Daniel Rudolf 2015-11-04 19:43:54 +01:00
parent e3a6116c79
commit ccac8dd4d3
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Pico.php
View File

@ -452,7 +452,10 @@ 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();
} else {
$this->config['base_url'] = rtrim($this->config['base_url'], '/') . '/';
} }
if (empty($this->config['content_dir'])) { if (empty($this->config['content_dir'])) {
// try to guess the content directory // try to guess the content directory
if (is_dir($this->getRootDir() . 'content')) { if (is_dir($this->getRootDir() . 'content')) {
@ -463,15 +466,14 @@ class Pico
} else { } 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'])) {
date_default_timezone_set($this->config['timezone']); if (empty($this->config['timezone'])) {
} else {
// explicitly set a default timezone to prevent a E_NOTICE // explicitly set a default timezone to prevent a E_NOTICE
// when no timezone is set; the `date_default_timezone_get()` // when no timezone is set; the `date_default_timezone_get()`
// function always returns a timezone, at least UTC // function always returns a timezone, at least UTC
$defaultTimezone = date_default_timezone_get(); $this->config['timezone'] = date_default_timezone_get();
date_default_timezone_set($defaultTimezone);
} }
date_default_timezone_set($this->config['timezone']);
} }
/** /**