using rtrim

diff --git a/lib/setup.php b/lib/setup.php
index e9c090c5b6a74bc4c8dff431bb933746d1703ded..b4b07bd70e494cac213f05e08f8bc7e470ae83f9 100644 (file)
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -71,10 +71,7 @@ class OC_Setup {
                        $datadir = htmlspecialchars_decode($options['directory']);
 
                        if (OC_Util::runningOnWindows()) {
-                               $datadir = realpath($datadir);
-                               if (substr($datadir, -1) == '\\') {
-                                       $datadir = substr_replace($datadir ,"",-1);
-                               }
+                               $datadir = rtrim(realpath($datadir), '\\');
                        }
 
                        //use sqlite3 when available, otherise sqlite2 will be used.