Merge branch 'WordPress:trunk' into trunk

Author: dd32

src/wp-includes/class-wp-icons-registry.php

@@ -170,6 +170,8 @@ public function register( $icon_name, $icon_properties ) {
 				);
 				return false;
 			}
+
+			$icon_properties['content'] = $sanitized_icon_content;
 		}
 
 		$qualified_name = $collection . '/' . $unqualified_name;

tests/phpunit/tests/icons/wpIconsRegistry.php

@@ -258,6 +258,28 @@ public function test_register_icon_with_file_path() {
 		$this->assertStringContainsString( '<svg', $icon['content'] );
 	}
 
+	/**
+	 * Should register an icon with its `content` sanitized.
+	 *
+	 * @ticket 64847
+	 *
+	 * @covers ::register
+	 */
+	public function test_register_icon_sanitizes_content() {
+		$result = $this->registry->register(
+			'test-collection/unsafe-content',
+			array(
+				'label'   => 'Icon',
+				'content' => '<svg viewbox="0 0 24 24" onload="alert(1)"><path d="M0 0" /></svg>',
+			)
+		);
+
+		$this->assertTrue( $result );
+
+		$icon = $this->registry->get_registered_icon( 'test-collection/unsafe-content' );
+		$this->assertSame( '<svg viewbox="0 0 24 24"><path d="M0 0" /></svg>', $icon['content'] );
+	}
+
 	/**
 	 * Should fail to register an icon that provides both `content` and `file_path`.
 	 *