Merge branch 'main' into bugfix/10788-storybook-hot-reload

GoogleForCreators · Apr 5, 2022 · 5f1c855 · 5f1c855
2 parents 1cb05fd + c8d961c
commit 5f1c855
Show file tree

Hide file tree

Showing 106 changed files with 4,390 additions and 2,157 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/includes/AMP/Traits/Sanitization_Utils.php b/includes/AMP/Traits/Sanitization_Utils.php
@@ -245,7 +245,7 @@ private function change_tag_name( DOMElement $node, string $tag_name ): void {
 				 *
 				 * @var DOMAttr $attr Attribute.
 				 */
-				$new_node->setAttribute( $attr->nodeName, $attr->nodeValue );
+				$new_node->setAttribute( $attr->nodeName, $attr->nodeValue ?? '' );
 			}
 		}
 

diff --git a/includes/Experiments.php b/includes/Experiments.php
@@ -358,6 +358,17 @@ public function get_experiments(): array {
 				'description' => __( 'Enable recording from webcam/microphone', 'web-stories' ),
 				'group'       => 'editor',
 			],
+			/**
+			 * Author: @spacedmonkey
+			 * Issue: #11081
+			 * Creation date: 2022-03-30
+			 */
+			[
+				'name'        => 'captionHotlinking',
+				'label'       => __( 'Caption hotlinking', 'web-stories' ),
+				'description' => __( 'Enable hotlinking of captions', 'web-stories' ),
+				'group'       => 'editor',
+			],
 		];
 	}
-Original file line number
+Diff line change
@@ Expand Up @@
     				 *
     				 * @var DOMAttr $attr Attribute.
     				 */
-    				$new_node->setAttribute( $attr->nodeName, $attr->nodeValue );
+    				$new_node->setAttribute( $attr->nodeName, $attr->nodeValue ?? '' );
     			}
     		}
@@ Expand Down @@