Merge remote-tracking branch 'upstream/master' into feat-federatedfilesharing-logging

4 files changed, 3 insertions, 3 deletions

diff --git a/core/img/favicon-touch.png b/core/img/favicon-touch.png
index 635806813a6..9754f8eb544 100644
--- a/core/img/favicon-touch.png
+++ b/core/img/favicon-touch.png
diff --git a/core/img/favicon-touch.svg b/core/img/favicon-touch.svg
index 82dfdc4fd44..f2e5d24da33 100644
--- a/core/img/favicon-touch.svg
+++ b/core/img/favicon-touch.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="128" width="128" viewBox="0 0 128 128"><rect rx="20" ry="20" height="128" width="128" fill="#0082c9"/><path style="text-decoration-color:#000;isolation:auto;mix-blend-mode:normal;block-progression:tb;text-decoration-line:none;text-indent:0;text-transform:none;text-decoration-style:solid" d="M64.09 37.368c-12.5 0-23 8.56-26.207 20.078-2.8-6.16-8.962-10.525-16.122-10.525C12.016 46.923 4 54.937 4 64.684c-.002 9.75 8.013 17.764 17.76 17.766 7.162-.002 13.32-4.37 16.12-10.53C41.086 83.438 51.588 92 64.092 92c12.434.002 22.88-8.467 26.153-19.886 2.845 6.046 8.913 10.334 15.99 10.335 9.75 0 17.767-8.016 17.766-17.767 0-9.75-8.015-17.764-17.764-17.762-7.078.002-13.15 4.29-15.994 10.336-3.274-11.42-13.717-19.89-26.15-19.888zm0 10.427a16.81 16.81 0 0 1 16.89 16.888c0 9.39-7.5 16.892-16.89 16.89a16.81 16.81 0 0 1-16.886-16.89c0-9.39 7.5-16.887 16.887-16.888zm-42.33 9.552c4.114 0 7.335 3.222 7.336 7.335 0 4.114-3.22 7.34-7.335 7.34-4.113 0-7.335-3.226-7.334-7.34 0-4.113 3.222-7.335 7.335-7.335zm84.475 0c4.114 0 7.338 3.22 7.338 7.335s-3.223 7.34-7.338 7.34c-4.114 0-7.336-3.226-7.335-7.34 0-4.113 3.222-7.335 7.335-7.335z" fill="#fff" color="#000" white-space="normal"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="128" width="128" viewBox="0 0 128 128"><rect height="128" width="128" fill="#0082c9"/><path style="text-decoration-color:#000;isolation:auto;mix-blend-mode:normal;block-progression:tb;text-decoration-line:none;text-indent:0;text-transform:none;text-decoration-style:solid" d="M64.09 37.368c-12.5 0-23 8.56-26.207 20.078-2.8-6.16-8.962-10.525-16.122-10.525C12.016 46.923 4 54.937 4 64.684c-.002 9.75 8.013 17.764 17.76 17.766 7.162-.002 13.32-4.37 16.12-10.53C41.086 83.438 51.588 92 64.092 92c12.434.002 22.88-8.467 26.153-19.886 2.845 6.046 8.913 10.334 15.99 10.335 9.75 0 17.767-8.016 17.766-17.767 0-9.75-8.015-17.764-17.764-17.762-7.078.002-13.15 4.29-15.994 10.336-3.274-11.42-13.717-19.89-26.15-19.888zm0 10.427a16.81 16.81 0 0 1 16.89 16.888c0 9.39-7.5 16.892-16.89 16.89a16.81 16.81 0 0 1-16.886-16.89c0-9.39 7.5-16.887 16.887-16.888zm-42.33 9.552c4.114 0 7.335 3.222 7.336 7.335 0 4.114-3.22 7.34-7.335 7.34-4.113 0-7.335-3.226-7.334-7.34 0-4.113 3.222-7.335 7.335-7.335zm84.475 0c4.114 0 7.338 3.22 7.338 7.335s-3.223 7.34-7.338 7.34c-4.114 0-7.336-3.226-7.335-7.34 0-4.113 3.222-7.335 7.335-7.335z" fill="#fff" color="#000" white-space="normal"/></svg>
diff --git a/core/img/manifest.json b/core/img/manifest.json
index fcecb856614..04e77df7a59 100644
--- a/core/img/manifest.json
+++ b/core/img/manifest.json
@@ -4,7 +4,7 @@
 	"icons": [{
 		"src": "favicon-touch.png",
 		"type": "image/png",
-		"sizes": "128x128"
+		"sizes": "180x180"
 	}, {
 		"src": "favicon-mask.svg",
 		"type": "image/svg+xml",
diff --git a/lib/private/Preview/WebP.php b/lib/private/Preview/WebP.php
index 8f10a08206b..d2172b1242c 100644
--- a/lib/private/Preview/WebP.php
+++ b/lib/private/Preview/WebP.php
@@ -37,6 +37,6 @@ class WebP extends Image {
 	}
 
 	public function isAvailable(FileInfo $file): bool {
-		return (bool)(imagetypes() && IMG_WEBP);
+		return (bool)(imagetypes() & IMG_WEBP);
 	}
 }