diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-03-19 07:38:41 -0700 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-03-19 07:38:41 -0700 |
| commit | 8ca01451fd2df2f61fa5d055bb4fd208e096ac0e (patch) | |
| tree | 91d958e45c8cae1e46a951bf382579f2620f2008 | |
| parent | 8858960a19d70b21296f0a2876344637361b0697 (diff) | |
| parent | 9dd3dcc5cda3b99fda45dc4ae4721afabaef9695 (diff) | |
| download | nextcloud-server-8ca01451fd2df2f61fa5d055bb4fd208e096ac0e.tar.gz nextcloud-server-8ca01451fd2df2f61fa5d055bb4fd208e096ac0e.zip | |
Merge pull request #2244 from owncloud/fixing-windows-datadir-master
remove trailing slash from data dir on windows
| -rw-r--r-- | lib/setup.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/setup.php b/lib/setup.php index 8814447f52f..b4b07bd70e4 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -70,6 +70,10 @@ class OC_Setup { $password = htmlspecialchars_decode($options['adminpass']); $datadir = htmlspecialchars_decode($options['directory']); + if (OC_Util::runningOnWindows()) { + $datadir = rtrim(realpath($datadir), '\\'); + } + //use sqlite3 when available, otherise sqlite2 will be used. if($dbtype=='sqlite' and class_exists('SQLite3')) { $dbtype='sqlite3'; |