open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed new checkstyle issues in migrate.php from build #1341.

Browse Source
remotes/origin/stable5
Diederik de Haas 13 years ago
parent 6e6df6e410
commit 20541c610e
1 changed files with 2 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      lib/migrate.php

4
lib/migrate.php
Unescape View File

@ -238,13 +238,13 @@ class OC_Migrate{
$userfolder = $extractpath . $json->exporteduser; $userfolder = $extractpath . $json->exporteduser;
$newuserfolder = $datadir . '/' . self::$uid; $newuserfolder = $datadir . '/' . self::$uid;
foreach(scandir($userfolder) as $file){ foreach(scandir($userfolder) as $file){
if($file !== '.' && $file !== '..' && is_dir($file)){ if($file !== '.' && $file !== '..' && is_dir($file)) {
// Then copy the folder over // Then copy the folder over
OC_Helper::copyr($userfolder.'/'.$file, $newuserfolder.'/'.$file); OC_Helper::copyr($userfolder.'/'.$file, $newuserfolder.'/'.$file);
} }
} }
// Import user app data // Import user app data
if(file_exists($extractpath . $json->exporteduser . '/migration.db')){ if(file_exists($extractpath . $json->exporteduser . '/migration.db')) {
if( !$appsimported = self::importAppData( $extractpath . $json->exporteduser . '/migration.db', $json, self::$uid ) ) { if( !$appsimported = self::importAppData( $extractpath . $json->exporteduser . '/migration.db', $json, self::$uid ) ) {
return json_encode( array( 'success' => false ) ); return json_encode( array( 'success' => false ) );
} }

Write Preview
Loading…
Cancel
Save