mirror of
https://git.code.sf.net/p/seeddms/code
synced 2026-02-02 06:31:56 +00:00
ensure rootDir has a leading DIRECTORY_SEP
This commit is contained in:
parent
80321c12fe
commit
5fd791bbf6
|
|
@ -645,11 +645,11 @@ class Settings { /* {{{ */
|
|||
if($node) {
|
||||
$tab = $node[0]->attributes();
|
||||
$this->_rootDir = strval($tab["rootDir"]);
|
||||
$this->_rootDir = rtrim($this->_rootDir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
|
||||
$this->_baseUrl = strval($tab["baseUrl"]);
|
||||
$this->_httpRoot = strval($tab["httpRoot"]);
|
||||
$this->_contentDir = strval($tab["contentDir"]);
|
||||
if($this->_contentDir && substr($this->_contentDir, -1, 1) != DIRECTORY_SEPARATOR)
|
||||
$this->_contentDir .= DIRECTORY_SEPARATOR;
|
||||
$this->_contentDir = rtrim($this->_contentDir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
|
||||
$this->_cacheDir = strval($tab["cacheDir"]);
|
||||
$this->_stagingDir = strval($tab["stagingDir"]);
|
||||
$this->_luceneDir = strval($tab["luceneDir"]);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user