Updated patches for 8.0.38.0.11

3 files changed, 1 insertions, 68 deletions

diff --git a/README.md b/README.md
index c77a22c0..5061debd 100644
--- a/README.md
+++ b/README.md
@@ -196,5 +196,4 @@ $ git pull --rebase origin stable8
 1. max-preview.pull.13674.patch : Limits previews to a max size of 2048x2048 by default
 2. bitmap-max-preview.pull.13635.patch : Forces the bitmap converter to respect the max limits of previews
 3. tmpfile-extension.pull.13654.patch : Makes sure temporary files have an extension so that ImageMagick can identify those files properly
-4. raw-preview.pull.13652.patch : Allows ownCloud to visualise Raw files
-5. stop-deleting-thumbnails.pull.14760.patch: Stop deleting all thumbnails when uploading pictures from the Android app
+4. raw-preview.pull.13652.patch : Allows ownCloud to visualise Raw files
\ No newline at end of file
diff --git a/patches/raw-preview.pull.13652.patch b/patches/raw-preview.pull.13652.patch
index 845cc0a2..db0f1dc2 100644
--- a/patches/raw-preview.pull.13652.patch
+++ b/patches/raw-preview.pull.13652.patch
@@ -4,7 +4,6 @@ Date: Sat, 24 Jan 2015 23:50:48 +0100
 Subject: [PATCH] Add support for Raw files previews
 
 ---
- config/config.sample.php       |  1 +
  lib/private/helper.php         |  1 +
  lib/private/mimetypes.list.php | 17 +++++++++++++++++
  lib/private/preview.php        |  3 ++-
@@ -13,18 +12,6 @@ Subject: [PATCH] Add support for Raw files previews
  6 files changed, 41 insertions(+), 2 deletions(-)
  create mode 100644 lib/private/preview/raw.php
 
-diff --git a/config/config.sample.php b/config/config.sample.php
-index 2513a26..6cc9261 100644
---- a/config/config.sample.php
-+++ b/config/config.sample.php
-@@ -669,6 +669,7 @@
-  *  - OC\Preview\StarOffice
-  *  - OC\Preview\SVG
-  *  - OC\Preview\TIFF
-+ *  - OC\Preview\Raw
-  *
-  * The following providers are not available in Microsoft Windows:
-  *
 diff --git a/lib/private/helper.php b/lib/private/helper.php
 index 6268bd3..ce38e90 100644
 --- a/lib/private/helper.php
diff --git a/patches/stop-deleting-thumbnails.pull.14760.patch b/patches/stop-deleting-thumbnails.pull.14760.patch
deleted file mode 100644
index ff5d9ecc..00000000
--- a/patches/stop-deleting-thumbnails.pull.14760.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From c100d90793235b00ed8a0a34fd3607d36a254715 Mon Sep 17 00:00:00 2001
-From: Joas Schilling <nickvergessen@owncloud.com>
-Date: Thu, 5 Mar 2015 16:07:42 +0100
-Subject: [PATCH] Check whether the file id is valid, before using it to delete
- the previews
-
----
- lib/private/preview.php | 19 ++++++++++---------
- 1 file changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/lib/private/preview.php b/lib/private/preview.php
-index c7ef006..f45cc08 100644
---- a/lib/private/preview.php
-+++ b/lib/private/preview.php
-@@ -14,6 +14,7 @@
- namespace OC;
- 
- use OC\Preview\Provider;
-+use OCP\Files\FileInfo;
- use OCP\Files\NotFoundException;
- 
- class Preview {
-@@ -327,21 +328,21 @@ public function deletePreview() {
- 	 * deletes all previews of a file
- 	 */
- 	public function deleteAllPreviews() {
--		$file = $this->getFile();
--
--		$fileInfo = $this->getFileInfo($file);
--
- 		$toDelete = $this->getChildren();
--		$toDelete[] = $fileInfo;
-+		$toDelete[] = $this->getFileInfo();
- 
- 		foreach ($toDelete as $delete) {
--			if ($delete !== null && $delete !== false) {
-+			if ($delete instanceof FileInfo) {
- 				/** @var \OCP\Files\FileInfo $delete */
- 				$fileId = $delete->getId();
- 
--				$previewPath = $this->getPreviewPath($fileId);
--				$this->userView->deleteAll($previewPath);
--				$this->userView->rmdir($previewPath);
-+				// getId() might return null, e.g. when the file is a
-+				// .ocTransferId*.part file from chunked file upload.
-+				if (!empty($fileId)) {
-+					$previewPath = $this->getPreviewPath($fileId);
-+					$this->userView->deleteAll($previewPath);
-+					$this->userView->rmdir($previewPath);
-+				}
- 			}
- 		}
- 	}