From e291f91bce9fc6fee7396a01699bf95ebc44f605 Mon Sep 17 00:00:00 2001
From: Glen Davies <glen.davies@a8c.com>
Date: Tue, 26 Jan 2021 15:43:32 +1300
Subject: [PATCH] Fix bug with custom link being overwritten by gallery linkTo
 changes

---
 packages/block-library/src/image/image.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/block-library/src/image/image.js b/packages/block-library/src/image/image.js
index 4b4879fba7e58..85985660c3d65 100644
--- a/packages/block-library/src/image/image.js
+++ b/packages/block-library/src/image/image.js
@@ -222,9 +222,10 @@ export default function Image( {
 			setAttributes( {
 				inheritedAttributes: {
 					...inheritedAttributes,
-					linkDestination: props.linkDestination
-						? false
-						: inheritedAttributes.linkDestination,
+					linkDestination:
+						props.linkDestination || props.href
+							? false
+							: inheritedAttributes.linkDestination,
 					linkTarget:
 						props.linkTarget || props.linkTarget !== linkTarget
 							? false