From 44bd80ae1bf42ce26ddc76f95b343301485bc6e5 Mon Sep 17 00:00:00 2001
From: Bart <bartlomiej.kalisz@gmail.com>
Date: Thu, 29 Oct 2020 17:35:44 +0100
Subject: [PATCH 1/9] Strip HTML from caption when saving as alt attribute

---
 packages/block-library/src/gallery/save.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/gallery/save.js b/packages/block-library/src/gallery/save.js
index 263055c0681e9..b0845abc18d82 100644
--- a/packages/block-library/src/gallery/save.js
+++ b/packages/block-library/src/gallery/save.js
@@ -2,6 +2,7 @@
  * WordPress dependencies
  */
 import { RichText } from '@wordpress/block-editor';
+import { __unstableStripHTML } from '@wordpress/dom';
 
 /**
  * Internal dependencies
@@ -43,7 +44,11 @@ export default function save( { attributes } ) {
 					const img = (
 						<img
 							src={ image.url }
-							alt={ image.alt !== '' ? image.alt : image.caption }
+							alt={
+								image.alt !== ''
+									? image.alt
+									: __unstableStripHTML( image.caption )
+							}
 							data-id={ image.id }
 							data-full-url={ image.fullUrl }
 							data-link={ image.link }

From 9d1937f357628be3f5a781f0060e0ec7521344db Mon Sep 17 00:00:00 2001
From: Bart <bartlomiej.kalisz@gmail.com>
Date: Thu, 29 Oct 2020 18:25:01 +0100
Subject: [PATCH 2/9] Add fixture for caption test

---
 .../core__gallery__image-with-caption.html    | 18 +++++++++++
 .../core__gallery__image-with-caption.json    | 31 +++++++++++++++++++
 ...e__gallery__image-with-caption.parsed.json | 25 +++++++++++++++
 ...allery__image-with-caption.serialized.html |  3 ++
 4 files changed, 77 insertions(+)
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.html
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.json
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.parsed.json
 create mode 100644 packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.serialized.html

diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.html b/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.html
new file mode 100644
index 0000000000000..31d0c86d59d15
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.html
@@ -0,0 +1,18 @@
+<!-- wp:core/gallery {"ids":[null,null]} -->
+<figure class="wp-block-gallery columns-2 is-cropped">
+	<ul class="blocks-gallery-grid">
+		<li class="blocks-gallery-item">
+			<figure>
+				<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt />
+				<figcaption class="blocks-gallery-item__caption">Caption with a <a href="#">link</a></figcaption>
+			</figure>
+		</li>
+		<li class="blocks-gallery-item">
+			<figure>
+				<img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt />
+				<figcaption class="blocks-gallery-item__caption">Caption without a link</figcaption>
+			</figure>
+		</li>
+	</ul>
+</figure>
+<!-- /wp:core/gallery -->
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.json b/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.json
new file mode 100644
index 0000000000000..70150767de28e
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.json
@@ -0,0 +1,31 @@
+[
+    {
+        "clientId": "_clientId_0",
+        "name": "core/gallery",
+        "isValid": true,
+        "attributes": {
+            "images": [
+                {
+                    "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
+                    "alt": "",
+                    "caption": "Caption with a <a href=\"#\">link</a>"
+                },
+                {
+                    "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
+                    "alt": "",
+                    "caption": "Caption without a link"
+                }
+            ],
+            "ids": [
+                null,
+                null
+            ],
+            "caption": "",
+            "imageCrop": true,
+            "linkTo": "none",
+            "sizeSlug": "large"
+        },
+        "innerBlocks": [],
+        "originalContent": "<figure class=\"wp-block-gallery columns-2 is-cropped\">\n\t<ul class=\"blocks-gallery-grid\">\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt />\n\t\t\t\t<figcaption class=\"blocks-gallery-item__caption\">Caption with a <a href=\"#\">link</a></figcaption>\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt />\n\t\t\t\t<figcaption class=\"blocks-gallery-item__caption\">Caption without a link</figcaption>\n\t\t\t</figure>\n\t\t</li>\n\t</ul>\n</figure>"
+    }
+]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.parsed.json b/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.parsed.json
new file mode 100644
index 0000000000000..58bb78328f48e
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.parsed.json
@@ -0,0 +1,25 @@
+[
+    {
+        "blockName": "core/gallery",
+        "attrs": {
+            "ids": [
+                null,
+                null
+            ]
+        },
+        "innerBlocks": [],
+        "innerHTML": "\n<figure class=\"wp-block-gallery columns-2 is-cropped\">\n\t<ul class=\"blocks-gallery-grid\">\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt />\n\t\t\t\t<figcaption class=\"blocks-gallery-item__caption\">Caption with a <a href=\"#\">link</a></figcaption>\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt />\n\t\t\t\t<figcaption class=\"blocks-gallery-item__caption\">Caption without a link</figcaption>\n\t\t\t</figure>\n\t\t</li>\n\t</ul>\n</figure>\n",
+        "innerContent": [
+            "\n<figure class=\"wp-block-gallery columns-2 is-cropped\">\n\t<ul class=\"blocks-gallery-grid\">\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt />\n\t\t\t\t<figcaption class=\"blocks-gallery-item__caption\">Caption with a <a href=\"#\">link</a></figcaption>\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt />\n\t\t\t\t<figcaption class=\"blocks-gallery-item__caption\">Caption without a link</figcaption>\n\t\t\t</figure>\n\t\t</li>\n\t</ul>\n</figure>\n"
+        ]
+    },
+    {
+        "blockName": null,
+        "attrs": {},
+        "innerBlocks": [],
+        "innerHTML": "\n",
+        "innerContent": [
+            "\n"
+        ]
+    }
+]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.serialized.html b/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.serialized.html
new file mode 100644
index 0000000000000..9148ad41cfa2f
--- /dev/null
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:gallery {"ids":[null,null],"linkTo":"none"} -->
+<figure class="wp-block-gallery columns-2 is-cropped"><ul class="blocks-gallery-grid"><li class="blocks-gallery-item"><figure><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="Caption with a link"/><figcaption class="blocks-gallery-item__caption">Caption with a <a href="#">link</a></figcaption></figure></li><li class="blocks-gallery-item"><figure><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="Caption without a link"/><figcaption class="blocks-gallery-item__caption">Caption without a link</figcaption></figure></li></ul></figure>
+<!-- /wp:gallery -->

From 599038193b69c401a93cb2be7de518fbfcfef421 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Thu, 29 Oct 2020 19:16:04 +0100
Subject: [PATCH 3/9] Fix tures

---
 .../fixtures/blocks/core__gallery__image-with-caption.html  | 4 ++--
 .../fixtures/blocks/core__gallery__image-with-caption.json  | 6 +++---
 .../blocks/core__gallery__image-with-caption.parsed.json    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.html b/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.html
index 31d0c86d59d15..f20ee4f773ff8 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.html
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.html
@@ -3,13 +3,13 @@
 	<ul class="blocks-gallery-grid">
 		<li class="blocks-gallery-item">
 			<figure>
-				<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt />
+				<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="Caption with a link" />
 				<figcaption class="blocks-gallery-item__caption">Caption with a <a href="#">link</a></figcaption>
 			</figure>
 		</li>
 		<li class="blocks-gallery-item">
 			<figure>
-				<img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt />
+				<img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="Caption without a link" />
 				<figcaption class="blocks-gallery-item__caption">Caption without a link</figcaption>
 			</figure>
 		</li>
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.json b/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.json
index 70150767de28e..f4f3f53741bff 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.json
@@ -7,12 +7,12 @@
             "images": [
                 {
                     "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
-                    "alt": "",
+                    "alt": "Caption with a link",
                     "caption": "Caption with a <a href=\"#\">link</a>"
                 },
                 {
                     "url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
-                    "alt": "",
+                    "alt": "Caption without a link",
                     "caption": "Caption without a link"
                 }
             ],
@@ -26,6 +26,6 @@
             "sizeSlug": "large"
         },
         "innerBlocks": [],
-        "originalContent": "<figure class=\"wp-block-gallery columns-2 is-cropped\">\n\t<ul class=\"blocks-gallery-grid\">\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt />\n\t\t\t\t<figcaption class=\"blocks-gallery-item__caption\">Caption with a <a href=\"#\">link</a></figcaption>\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt />\n\t\t\t\t<figcaption class=\"blocks-gallery-item__caption\">Caption without a link</figcaption>\n\t\t\t</figure>\n\t\t</li>\n\t</ul>\n</figure>"
+        "originalContent": "<figure class=\"wp-block-gallery columns-2 is-cropped\">\n\t<ul class=\"blocks-gallery-grid\">\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"Caption with a link\" />\n\t\t\t\t<figcaption class=\"blocks-gallery-item__caption\">Caption with a <a href=\"#\">link</a></figcaption>\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"Caption without a link\" />\n\t\t\t\t<figcaption class=\"blocks-gallery-item__caption\">Caption without a link</figcaption>\n\t\t\t</figure>\n\t\t</li>\n\t</ul>\n</figure>"
     }
 ]
diff --git a/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.parsed.json b/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.parsed.json
index 58bb78328f48e..303050649e0c9 100644
--- a/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.parsed.json
+++ b/packages/e2e-tests/fixtures/blocks/core__gallery__image-with-caption.parsed.json
@@ -8,9 +8,9 @@
             ]
         },
         "innerBlocks": [],
-        "innerHTML": "\n<figure class=\"wp-block-gallery columns-2 is-cropped\">\n\t<ul class=\"blocks-gallery-grid\">\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt />\n\t\t\t\t<figcaption class=\"blocks-gallery-item__caption\">Caption with a <a href=\"#\">link</a></figcaption>\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt />\n\t\t\t\t<figcaption class=\"blocks-gallery-item__caption\">Caption without a link</figcaption>\n\t\t\t</figure>\n\t\t</li>\n\t</ul>\n</figure>\n",
+        "innerHTML": "\n<figure class=\"wp-block-gallery columns-2 is-cropped\">\n\t<ul class=\"blocks-gallery-grid\">\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"Caption with a link\" />\n\t\t\t\t<figcaption class=\"blocks-gallery-item__caption\">Caption with a <a href=\"#\">link</a></figcaption>\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"Caption without a link\" />\n\t\t\t\t<figcaption class=\"blocks-gallery-item__caption\">Caption without a link</figcaption>\n\t\t\t</figure>\n\t\t</li>\n\t</ul>\n</figure>\n",
         "innerContent": [
-            "\n<figure class=\"wp-block-gallery columns-2 is-cropped\">\n\t<ul class=\"blocks-gallery-grid\">\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt />\n\t\t\t\t<figcaption class=\"blocks-gallery-item__caption\">Caption with a <a href=\"#\">link</a></figcaption>\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt />\n\t\t\t\t<figcaption class=\"blocks-gallery-item__caption\">Caption without a link</figcaption>\n\t\t\t</figure>\n\t\t</li>\n\t</ul>\n</figure>\n"
+            "\n<figure class=\"wp-block-gallery columns-2 is-cropped\">\n\t<ul class=\"blocks-gallery-grid\">\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"Caption with a link\" />\n\t\t\t\t<figcaption class=\"blocks-gallery-item__caption\">Caption with a <a href=\"#\">link</a></figcaption>\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"Caption without a link\" />\n\t\t\t\t<figcaption class=\"blocks-gallery-item__caption\">Caption without a link</figcaption>\n\t\t\t</figure>\n\t\t</li>\n\t</ul>\n</figure>\n"
         ]
     },
     {

From 11ef15ca87e4df0c3d3c67fb3ef6dd96e6f30612 Mon Sep 17 00:00:00 2001
From: Bart <bartlomiej.kalisz@gmail.com>
Date: Fri, 30 Oct 2020 13:55:25 +0100
Subject: [PATCH 4/9] Deprecate the block & add alt attribute migration

---
 .../block-library/src/gallery/deprecated.js   | 178 ++++++++++++++++++
 1 file changed, 178 insertions(+)

diff --git a/packages/block-library/src/gallery/deprecated.js b/packages/block-library/src/gallery/deprecated.js
index e6fd71a696cec..a8a728464b2a4 100644
--- a/packages/block-library/src/gallery/deprecated.js
+++ b/packages/block-library/src/gallery/deprecated.js
@@ -8,6 +8,7 @@ import { map, some } from 'lodash';
  * WordPress dependencies
  */
 import { RichText } from '@wordpress/block-editor';
+import { __unstableStripHTML } from '@wordpress/dom';
 
 /**
  * Internal dependencies
@@ -19,6 +20,183 @@ import {
 } from './constants';
 
 const deprecated = [
+	{
+		attributes: {
+			images: {
+				type: 'array',
+				default: [],
+				source: 'query',
+				selector: '.blocks-gallery-item',
+				query: {
+					url: {
+						type: 'string',
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'src',
+					},
+					fullUrl: {
+						type: 'string',
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'data-full-url',
+					},
+					link: {
+						type: 'string',
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'data-link',
+					},
+					alt: {
+						type: 'string',
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'alt',
+						default: '',
+					},
+					id: {
+						type: 'string',
+						source: 'attribute',
+						selector: 'img',
+						attribute: 'data-id',
+					},
+					caption: {
+						type: 'string',
+						source: 'html',
+						selector: '.blocks-gallery-item__caption',
+					},
+				},
+			},
+			ids: {
+				type: 'array',
+				items: {
+					type: 'number',
+				},
+				default: [],
+			},
+			columns: {
+				type: 'number',
+				minimum: 1,
+				maximum: 8,
+			},
+			caption: {
+				type: 'string',
+				source: 'html',
+				selector: '.blocks-gallery-caption',
+			},
+			imageCrop: {
+				type: 'boolean',
+				default: true,
+			},
+			linkTo: {
+				type: 'string',
+			},
+			sizeSlug: {
+				type: 'string',
+				default: 'large',
+			},
+		},
+		supports: {
+			anchor: true,
+			align: true,
+		},
+		isEligible( { images } ) {
+			return (
+				images &&
+				images.some(
+					( image ) => image.alt !== __unstableStripHTML( image.alt )
+				)
+			);
+		},
+		migrate( attributes ) {
+			return {
+				...attributes,
+				images: attributes.images.map( ( image ) => {
+					if ( image.alt !== __unstableStripHTML( image.alt ) ) {
+						return __unstableStripHTML( image.alt );
+					}
+					return image.alt;
+				} ),
+			};
+		},
+		save( { attributes } ) {
+			const {
+				images,
+				columns = defaultColumnsNumber( attributes ),
+				imageCrop,
+				caption,
+				linkTo,
+			} = attributes;
+
+			return (
+				<figure
+					className={ `columns-${ columns } ${
+						imageCrop ? 'is-cropped' : ''
+					}` }
+				>
+					<ul className="blocks-gallery-grid">
+						{ images.map( ( image ) => {
+							let href;
+
+							switch ( linkTo ) {
+								case LINK_DESTINATION_MEDIA:
+									href = image.fullUrl || image.url;
+									break;
+								case LINK_DESTINATION_ATTACHMENT:
+									href = image.link;
+									break;
+							}
+
+							const img = (
+								<img
+									src={ image.url }
+									alt={ image.alt }
+									data-id={ image.id }
+									data-full-url={ image.fullUrl }
+									data-link={ image.link }
+									className={
+										image.id
+											? `wp-image-${ image.id }`
+											: null
+									}
+								/>
+							);
+
+							return (
+								<li
+									key={ image.id || image.url }
+									className="blocks-gallery-item"
+								>
+									<figure>
+										{ href ? (
+											<a href={ href }>{ img }</a>
+										) : (
+											img
+										) }
+										{ ! RichText.isEmpty(
+											image.caption
+										) && (
+											<RichText.Content
+												tagName="figcaption"
+												className="blocks-gallery-item__caption"
+												value={ image.caption }
+											/>
+										) }
+									</figure>
+								</li>
+							);
+						} ) }
+					</ul>
+					{ ! RichText.isEmpty( caption ) && (
+						<RichText.Content
+							tagName="figcaption"
+							className="blocks-gallery-caption"
+							value={ caption }
+						/>
+					) }
+				</figure>
+			);
+		},
+	},
 	{
 		attributes: {
 			images: {

From 887744d411ff7b4b7504421e5dee46ef9fefbe7d Mon Sep 17 00:00:00 2001
From: Bart <bartlomiej.kalisz@gmail.com>
Date: Fri, 30 Oct 2020 14:16:13 +0100
Subject: [PATCH 5/9] Fix migration

---
 packages/block-library/src/gallery/deprecated.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/block-library/src/gallery/deprecated.js b/packages/block-library/src/gallery/deprecated.js
index a8a728464b2a4..8542eb5bfc656 100644
--- a/packages/block-library/src/gallery/deprecated.js
+++ b/packages/block-library/src/gallery/deprecated.js
@@ -111,10 +111,16 @@ const deprecated = [
 			return {
 				...attributes,
 				images: attributes.images.map( ( image ) => {
-					if ( image.alt !== __unstableStripHTML( image.alt ) ) {
-						return __unstableStripHTML( image.alt );
+					let alt = image.alt;
+
+					if ( alt !== __unstableStripHTML( alt ) ) {
+						alt = __unstableStripHTML( image.alt );
 					}
-					return image.alt;
+
+					return {
+						...image,
+						alt,
+					};
 				} ),
 			};
 		},

From 20fa2f34af28c7fe513f1c066f7532f404872ca7 Mon Sep 17 00:00:00 2001
From: Bart <bartlomiej.kalisz@gmail.com>
Date: Mon, 2 Nov 2020 14:47:09 +0100
Subject: [PATCH 6/9] Make alt attr fall back to caption on save ...and strip
 it from the HTML if present.

---
 packages/block-library/src/gallery/save.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/block-library/src/gallery/save.js b/packages/block-library/src/gallery/save.js
index b0845abc18d82..7c0d27741bfcd 100644
--- a/packages/block-library/src/gallery/save.js
+++ b/packages/block-library/src/gallery/save.js
@@ -41,14 +41,16 @@ export default function save( { attributes } ) {
 							break;
 					}
 
+					let alt = image.alt || image.caption || '';
+
+					if ( alt !== __unstableStripHTML( alt ) ) {
+						alt = __unstableStripHTML( alt );
+					}
+
 					const img = (
 						<img
 							src={ image.url }
-							alt={
-								image.alt !== ''
-									? image.alt
-									: __unstableStripHTML( image.caption )
-							}
+							alt={ alt }
 							data-id={ image.id }
 							data-full-url={ image.fullUrl }
 							data-link={ image.link }

From 9da56ed71bd0bcf7f5a065f66174f73d39a62e46 Mon Sep 17 00:00:00 2001
From: Bart <bartlomiej.kalisz@gmail.com>
Date: Mon, 2 Nov 2020 14:55:29 +0100
Subject: [PATCH 7/9] Remove unnecessary deprecation

---
 .../block-library/src/gallery/deprecated.js   | 184 ------------------
 1 file changed, 184 deletions(-)

diff --git a/packages/block-library/src/gallery/deprecated.js b/packages/block-library/src/gallery/deprecated.js
index 8542eb5bfc656..e6fd71a696cec 100644
--- a/packages/block-library/src/gallery/deprecated.js
+++ b/packages/block-library/src/gallery/deprecated.js
@@ -8,7 +8,6 @@ import { map, some } from 'lodash';
  * WordPress dependencies
  */
 import { RichText } from '@wordpress/block-editor';
-import { __unstableStripHTML } from '@wordpress/dom';
 
 /**
  * Internal dependencies
@@ -20,189 +19,6 @@ import {
 } from './constants';
 
 const deprecated = [
-	{
-		attributes: {
-			images: {
-				type: 'array',
-				default: [],
-				source: 'query',
-				selector: '.blocks-gallery-item',
-				query: {
-					url: {
-						type: 'string',
-						source: 'attribute',
-						selector: 'img',
-						attribute: 'src',
-					},
-					fullUrl: {
-						type: 'string',
-						source: 'attribute',
-						selector: 'img',
-						attribute: 'data-full-url',
-					},
-					link: {
-						type: 'string',
-						source: 'attribute',
-						selector: 'img',
-						attribute: 'data-link',
-					},
-					alt: {
-						type: 'string',
-						source: 'attribute',
-						selector: 'img',
-						attribute: 'alt',
-						default: '',
-					},
-					id: {
-						type: 'string',
-						source: 'attribute',
-						selector: 'img',
-						attribute: 'data-id',
-					},
-					caption: {
-						type: 'string',
-						source: 'html',
-						selector: '.blocks-gallery-item__caption',
-					},
-				},
-			},
-			ids: {
-				type: 'array',
-				items: {
-					type: 'number',
-				},
-				default: [],
-			},
-			columns: {
-				type: 'number',
-				minimum: 1,
-				maximum: 8,
-			},
-			caption: {
-				type: 'string',
-				source: 'html',
-				selector: '.blocks-gallery-caption',
-			},
-			imageCrop: {
-				type: 'boolean',
-				default: true,
-			},
-			linkTo: {
-				type: 'string',
-			},
-			sizeSlug: {
-				type: 'string',
-				default: 'large',
-			},
-		},
-		supports: {
-			anchor: true,
-			align: true,
-		},
-		isEligible( { images } ) {
-			return (
-				images &&
-				images.some(
-					( image ) => image.alt !== __unstableStripHTML( image.alt )
-				)
-			);
-		},
-		migrate( attributes ) {
-			return {
-				...attributes,
-				images: attributes.images.map( ( image ) => {
-					let alt = image.alt;
-
-					if ( alt !== __unstableStripHTML( alt ) ) {
-						alt = __unstableStripHTML( image.alt );
-					}
-
-					return {
-						...image,
-						alt,
-					};
-				} ),
-			};
-		},
-		save( { attributes } ) {
-			const {
-				images,
-				columns = defaultColumnsNumber( attributes ),
-				imageCrop,
-				caption,
-				linkTo,
-			} = attributes;
-
-			return (
-				<figure
-					className={ `columns-${ columns } ${
-						imageCrop ? 'is-cropped' : ''
-					}` }
-				>
-					<ul className="blocks-gallery-grid">
-						{ images.map( ( image ) => {
-							let href;
-
-							switch ( linkTo ) {
-								case LINK_DESTINATION_MEDIA:
-									href = image.fullUrl || image.url;
-									break;
-								case LINK_DESTINATION_ATTACHMENT:
-									href = image.link;
-									break;
-							}
-
-							const img = (
-								<img
-									src={ image.url }
-									alt={ image.alt }
-									data-id={ image.id }
-									data-full-url={ image.fullUrl }
-									data-link={ image.link }
-									className={
-										image.id
-											? `wp-image-${ image.id }`
-											: null
-									}
-								/>
-							);
-
-							return (
-								<li
-									key={ image.id || image.url }
-									className="blocks-gallery-item"
-								>
-									<figure>
-										{ href ? (
-											<a href={ href }>{ img }</a>
-										) : (
-											img
-										) }
-										{ ! RichText.isEmpty(
-											image.caption
-										) && (
-											<RichText.Content
-												tagName="figcaption"
-												className="blocks-gallery-item__caption"
-												value={ image.caption }
-											/>
-										) }
-									</figure>
-								</li>
-							);
-						} ) }
-					</ul>
-					{ ! RichText.isEmpty( caption ) && (
-						<RichText.Content
-							tagName="figcaption"
-							className="blocks-gallery-caption"
-							value={ caption }
-						/>
-					) }
-				</figure>
-			);
-		},
-	},
 	{
 		attributes: {
 			images: {

From 5359033ab0c2f77a9fc64c4d5fb548f50728020e Mon Sep 17 00:00:00 2001
From: Bart <bartlomiej.kalisz@gmail.com>
Date: Mon, 2 Nov 2020 15:41:40 +0100
Subject: [PATCH 8/9] Do not assign empty string to `alt` on save

---
 packages/block-library/src/gallery/save.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/gallery/save.js b/packages/block-library/src/gallery/save.js
index 7c0d27741bfcd..11feb8412b249 100644
--- a/packages/block-library/src/gallery/save.js
+++ b/packages/block-library/src/gallery/save.js
@@ -41,9 +41,9 @@ export default function save( { attributes } ) {
 							break;
 					}
 
-					let alt = image.alt || image.caption || '';
+					let alt = image.alt || image.caption;
 
-					if ( alt !== __unstableStripHTML( alt ) ) {
+					if ( alt && alt !== __unstableStripHTML( alt ) ) {
 						alt = __unstableStripHTML( alt );
 					}
 

From 138e64009ddb2d4c30c2f00de9cb1c0f715d53d0 Mon Sep 17 00:00:00 2001
From: Bart Kalisz <bartlomiej.kalisz@gmail.com>
Date: Mon, 2 Nov 2020 18:36:41 +0100
Subject: [PATCH 9/9] Add explanation comment for stripping the `alt` HTML

Co-authored-by: Bernie Reiter <ockham@raz.or.at>
---
 packages/block-library/src/gallery/save.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/block-library/src/gallery/save.js b/packages/block-library/src/gallery/save.js
index 11feb8412b249..a77a0761cb83e 100644
--- a/packages/block-library/src/gallery/save.js
+++ b/packages/block-library/src/gallery/save.js
@@ -41,6 +41,10 @@ export default function save( { attributes } ) {
 							break;
 					}
 
+					// image.caption comes from a RichText component, so it can contain
+					// HTML that we need to strip. In GB 9.2, image.alt would fall back to
+					// image.caption without stripping the HTML, so we also run it through
+					// __unstableStripHTML here.
 					let alt = image.alt || image.caption;
 
 					if ( alt && alt !== __unstableStripHTML( alt ) ) {