Merge pull request #2244 from owncloud/fixing-windows-datadir-master

remove trailing slash from data dir on windows
This commit is contained in:
Bernhard Posselt 2013-03-19 07:38:41 -07:00
commit 8ca01451fd

View file

@ -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';