Media links: fix linking for images inserted from URL. (#22195)

WordPress · Oct 6, 2020 · 029b1d3 · 029b1d3
1 parent 0dd98ce
commit 029b1d3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/packages/block-editor/src/components/url-popover/image-url-input-ui.js b/packages/block-editor/src/components/url-popover/image-url-input-ui.js
@@ -174,14 +174,16 @@ const ImageURLInputUI = ( {
 	} );
 
 	const getLinkDestinations = () => {
-		return [
+		const linkDestinations = [
 			{
 				linkDestination: LINK_DESTINATION_MEDIA,
 				title: __( 'Media File' ),
 				url: mediaType === 'image' ? mediaUrl : undefined,
 				icon,
 			},
-			{
+		];
+		if ( mediaType === 'image' && mediaLink ) {
+			linkDestinations.push( {
 				linkDestination: LINK_DESTINATION_ATTACHMENT,
 				title: __( 'Attachment Page' ),
 				url: mediaType === 'image' ? mediaLink : undefined,
@@ -191,8 +193,9 @@ const ImageURLInputUI = ( {
 						<Path d="M14 2H6c-1.1 0-1.99.9-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8l-6-6zM6 20V4h7v5h5v11H6z" />
 					</SVG>
 				),
-			},
-		];
+			} );
+		}
+		return linkDestinations;
 	};
 
 	const onSetHref = ( value ) => {

diff --git a/packages/block-library/src/image/image.js b/packages/block-library/src/image/image.js
@@ -254,7 +254,7 @@ export default function Image( {
 							url={ href || '' }
 							onChangeUrl={ onSetHref }
 							linkDestination={ linkDestination }
-							mediaUrl={ image && image.source_url }
+							mediaUrl={ ( image && image.source_url ) || url }
 							mediaLink={ image && image.link }
 							linkTarget={ linkTarget }
 							linkClass={ linkClass }