diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-04-09 15:16:15 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-04-10 10:09:22 +0200 |
| commit | 16b0855992a984b238ac5bb33154dee18a52954a (patch) | |
| tree | 144726fc75862ac9806dc024aff3933c0588d6e9 | |
| parent | c06bc81c791ba0dd01c8b5d4757745561a33e662 (diff) | |
| download | nextcloud-server-16b0855992a984b238ac5bb33154dee18a52954a.tar.gz nextcloud-server-16b0855992a984b238ac5bb33154dee18a52954a.zip | |
only add filesize to trashbin size if the file was moved to the trash bin successfully
| -rw-r--r-- | apps/files_trashbin/lib/trash.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index d68d157158b..35a2e1a8a1e 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -61,9 +61,11 @@ class Trashbin { if ( $trashbinSize === false || $trashbinSize < 0 ) { $trashbinSize = self::calculateSize(new \OC\Files\View('/'. $user.'/files_trashbin')); } - $trashbinSize += self::copy_recursive($file_path, 'files_trashbin/files/'.$deleted.'.d'.$timestamp, $view); - + + $sizeOfAddedFiles = self::copy_recursive($file_path, 'files_trashbin/files/'.$deleted.'.d'.$timestamp, $view); + if ( $view->file_exists('files_trashbin/files/'.$deleted.'.d'.$timestamp) ) { + $trashbinSize += $sizeOfAddedFiles; $query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`type`,`mime`,`user`) VALUES (?,?,?,?,?,?)"); $result = $query->execute(array($deleted, $timestamp, $location, $type, $mime, $user)); if ( !$result ) { // if file couldn't be added to the database than also don't store it in the trash bin. |