diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2012-08-27 14:00:17 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2012-08-27 14:00:17 +0200 |
| commit | 3970d0e63671c11b3efe87caec9bca51c7a0908d (patch) | |
| tree | b064824e6f15e3f2d80b261e0c07ecab85ce784c | |
| parent | d91bd37bd7c576fcabab446d7c746727faaff5e1 (diff) | |
| parent | 16aff1045d5937cc6537e5da714a7ee4bd2edd95 (diff) | |
| download | nextcloud-server-3970d0e63671c11b3efe87caec9bca51c7a0908d.tar.gz nextcloud-server-3970d0e63671c11b3efe87caec9bca51c7a0908d.zip | |
Merge branch 'master' of github.com:owncloud/core
| -rw-r--r-- | lib/migrate.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/migrate.php b/lib/migrate.php index 917d77eaca0..e998cf1f4a8 100644 --- a/lib/migrate.php +++ b/lib/migrate.php @@ -141,7 +141,7 @@ class OC_Migrate{ // Export the app info $exportdata = self::exportAppData(); // Add the data dir to the zip - self::$content->addDir( $datadir . '/' . self::$uid, true, '/' ); + self::$content->addDir(OC_User::getHome(self::$uid), true, '/' ); break; case 'instance': self::$content = new OC_Migration_Content( self::$zip ); @@ -159,14 +159,14 @@ class OC_Migrate{ self::$content->addFromString( $dbexport, "dbexport.xml" ); // Add user data foreach(OC_User::getUsers() as $user){ - self::$content->addDir( $datadir . '/' . $user . '/', true, "/userdata/" ); + self::$content->addDir(OC_User::getHome($user), true, "/userdata/" ); } break; case 'userfiles': self::$content = new OC_Migration_Content( self::$zip ); // Creates a zip with all of the users files foreach(OC_User::getUsers() as $user){ - self::$content->addDir( $datadir . '/' . $user . '/', true, "/" ); + self::$content->addDir(OC_User::getHome($user), true, "/" ); } break; case 'system': |