Ensure SVG icon is a string

westonruter · westonruter · commit cfb02ce5b245 · 2026-02-17T08:51:42.000-08:00
diff --git a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-svg-icons.php b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-svg-icons.php
@@ -181,12 +181,12 @@ public static function get_svg( $group, $icon, $size ) {
 		 *
 		 * @since Twenty Twenty-One 1.0
 		 *
-		 * @param array $arr Array of icons.
+		 * @param array<string, string> $arr Array of icons.
 		 */
 		$arr = apply_filters( "twenty_twenty_one_svg_icons_{$group}", $arr );
 
 		$svg = '';
-		if ( array_key_exists( $icon, $arr ) ) {
+		if ( isset( $arr[ $icon ] ) && is_string( $arr[ $icon ] ) ) {
 			$repl = sprintf( '<svg class="svg-icon" width="%d" height="%d" aria-hidden="true" role="img" focusable="false" ', $size, $size );
 
 			$svg = (string) preg_replace( '/^<svg /', $repl, trim( $arr[ $icon ] ) ); // Add extra attributes to SVG code.

Original file line number	Diff line number	Diff line change
`@@ -181,12 +181,12 @@ public static function get_svg( $group, $icon, $size ) {`
`181`	`181`	`*`
`182`	`182`	`* @since Twenty Twenty-One 1.0`
`183`	`183`	`*`
`184`		`- * @param array $arr Array of icons.`
	`184`	`+ * @param array<string, string> $arr Array of icons.`
`185`	`185`	`*/`
`186`	`186`	`$arr = apply_filters( "twenty_twenty_one_svg_icons_{$group}", $arr );`
`187`	`187`
`188`	`188`	`$svg = '';`
`189`		`- if ( array_key_exists( $icon, $arr ) ) {`
	`189`	`+ if ( isset( $arr[ $icon ] ) && is_string( $arr[ $icon ] ) ) {`
`190`	`190`	`$repl = sprintf( '<svg class="svg-icon" width="%d" height="%d" aria-hidden="true" role="img" focusable="false" ', $size, $size );`
`191`	`191`
`192`	`192`	`$svg = (string) preg_replace( '/^<svg /', $repl, trim( $arr[ $icon ] ) ); // Add extra attributes to SVG code.`