diff options
Diffstat (limited to 'apps/files_versions')
| -rw-r--r-- | apps/files_versions/l10n/fr.js | 3 | ||||
| -rw-r--r-- | apps/files_versions/l10n/fr.json | 3 | ||||
| -rw-r--r-- | apps/files_versions/lib/Storage.php | 8 |
3 files changed, 11 insertions, 3 deletions
diff --git a/apps/files_versions/l10n/fr.js b/apps/files_versions/l10n/fr.js index 34d2e110a98..88e5299734e 100644 --- a/apps/files_versions/l10n/fr.js +++ b/apps/files_versions/l10n/fr.js @@ -23,6 +23,7 @@ OC.L10N.register( "Version restored" : "Version restaurée", "Could not restore version" : "Impossible de restaurer la version", "Could not set version label" : "Impossible de définir l'étiquette de version", - "Could not delete version" : "Impossible de supprimer la version" + "Could not delete version" : "Impossible de supprimer la version", + "File versions" : "Versions des fichiers" }, "nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"); diff --git a/apps/files_versions/l10n/fr.json b/apps/files_versions/l10n/fr.json index 3e5343e93dc..e59d1f3e59c 100644 --- a/apps/files_versions/l10n/fr.json +++ b/apps/files_versions/l10n/fr.json @@ -21,6 +21,7 @@ "Version restored" : "Version restaurée", "Could not restore version" : "Impossible de restaurer la version", "Could not set version label" : "Impossible de définir l'étiquette de version", - "Could not delete version" : "Impossible de supprimer la version" + "Could not delete version" : "Impossible de supprimer la version", + "File versions" : "Versions des fichiers" },"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;" }
\ No newline at end of file diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php index 4b58d721583..0fb3a0522f4 100644 --- a/apps/files_versions/lib/Storage.php +++ b/apps/files_versions/lib/Storage.php @@ -430,11 +430,17 @@ class Storage { } else { $target = $storage2->fopen($internalPath2, 'w'); $result = $target !== false; - if ($target !== false) { + if ($result) { [, $result] = Files::streamCopy($source, $target, true); + } + // explicit check as S3 library closes streams already + if (is_resource($target)) { fclose($target); } } + } + // explicit check as S3 library closes streams already + if (is_resource($source)) { fclose($source); } |