Merge pull request #1532 from nextcloud/revert-1517-stable9.1-fix-openbasedir-realpath-warning
Revert "[stable10] Only use realpath for real directories (#26060)"
This commit is contained in:
commit
9b0fca35ba
|
@ -54,12 +54,7 @@ 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), '/') . '/';
|
||||
}
|
||||
$this->realDataDir = rtrim(realpath($this->datadir), '/') . '/';
|
||||
if (substr($this->datadir, -1) !== '/') {
|
||||
$this->datadir .= '/';
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue