Merge pull request #1517 from nextcloud/stable9.1-fix-openbasedir-realpath-warning

[stable10] Only use realpath for real directories (#26060)
This commit is contained in:
Morris Jobke 2016-09-27 00:11:42 +02:00 committed by GitHub
commit ffaa2512f3
1 changed files with 6 additions and 1 deletions

View File

@ -54,7 +54,12 @@ class Local extends \OC\Files\Storage\Common {
throw new \InvalidArgumentException('No data directory set for local storage');
}
$this->datadir = $arguments['datadir'];
// some crazy code uses a local storage on root...
if ($this->datadir === '/') {
$this->realDataDir = $this->datadir;
} else {
$this->realDataDir = rtrim(realpath($this->datadir), '/') . '/';
}
if (substr($this->datadir, -1) !== '/') {
$this->datadir .= '/';
}