Changeset 61654

Timestamp:

02/16/2026 10:38:01 PM (3 months ago)

Author:

SergeyBiryukov

Message:

Twenty Twenty-One: Remove EscapeOutput annotations.

These are from the WordPress-Extra standard, which is not included in the phpcs.xml.dist configuration (the repository uses WordPress-Core).

Includes removing unnecessary WPThemeReview annotations carried over from upstream.

Follow-up to [49216].

Props rodrigosprimo.
See #64627.

Location:

trunk/src/wp-content/themes/twentytwentyone

Files:

• classes/class-twenty-twenty-one-customize.php (modified) (1 diff)
• classes/class-twenty-twenty-one-dark-mode.php (modified) (1 diff)
• image.php (modified) (1 diff)
• inc/back-compat.php (modified) (1 diff)
• inc/custom-css.php (modified) (1 diff)
• inc/template-functions.php (modified) (2 diffs)
• inc/template-tags.php (modified) (6 diffs)
• searchform.php (modified) (1 diff)
• template-parts/header/site-branding.php (modified) (1 diff)
• template-parts/header/site-nav.php (modified) (1 diff)

trunk/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-customize.php

@@ -114 +114 @@
             // Background color.
             // Include the custom control class.
-            require_once get_theme_file_path( 'classes/class-twenty-twenty-one-customize-color-control.php' ); // phpcs:ignore WPThemeReview.CoreFunctionality.FileInclude.FileIncludeFound
+            require_once get_theme_file_path( 'classes/class-twenty-twenty-one-customize-color-control.php' );
 
             // Register the custom control.

trunk/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php

@@ -138 +138 @@
 
         // Custom notice control.
-        require_once get_theme_file_path( 'classes/class-twenty-twenty-one-customize-notice-control.php' ); // phpcs:ignore WPThemeReview.CoreFunctionality.FileInclude.FileIncludeFound
+        require_once get_theme_file_path( 'classes/class-twenty-twenty-one-customize-notice-control.php' );
 
         $wp_customize->add_setting(

trunk/src/wp-content/themes/twentytwentyone/image.php

@@ -82 +82 @@
                     '<span class="full-size-link"><span class="screen-reader-text">%1$s</span><a href="%2$s">%3$s &times; %4$s</a></span>',
                     /* translators: Hidden accessibility text. */
-                    esc_html_x( 'Full size', 'Used before full size attachment link.', 'twentytwentyone' ), // phpcs:ignore WordPress.Security.EscapeOutput
+                    esc_html_x( 'Full size', 'Used before full size attachment link.', 'twentytwentyone' ),
                     esc_url( wp_get_attachment_url() ),
                     absint( $metadata['width'] ),

trunk/src/wp-content/themes/twentytwentyone/inc/back-compat.php

@@ -80 +80 @@
  */
 function twenty_twenty_one_preview() {
-    if ( isset( $_GET['preview'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+    if ( isset( $_GET['preview'] ) ) {
         wp_die(
             sprintf(

trunk/src/wp-content/themes/twentytwentyone/inc/custom-css.php

@@ -37 +37 @@
          * malicious attempts to close </style> and open a <script>.
          */
-        echo wp_strip_all_tags( $css ); // phpcs:ignore WordPress.Security.EscapeOutput
+        echo wp_strip_all_tags( $css );
     }
     return $css;

trunk/src/wp-content/themes/twentytwentyone/inc/template-functions.php

@@ -336 +336 @@
     // Include file if function doesn't exist.
     if ( ! function_exists( 'twenty_twenty_one_generate_css' ) ) {
-        require_once get_theme_file_path( 'inc/custom-css.php' ); // phpcs:ignore WPThemeReview.CoreFunctionality.FileInclude.FileIncludeFound
+        require_once get_theme_file_path( 'inc/custom-css.php' );
     }
 
@@ -406 +406 @@
     if ( $blocks_content ) {
         /** This filter is documented in wp-includes/post-template.php */
-        echo apply_filters( 'the_content', $blocks_content ); // phpcs:ignore WordPress.Security.EscapeOutput
+        echo apply_filters( 'the_content', $blocks_content );
         return true;
     }

trunk/src/wp-content/themes/twentytwentyone/inc/template-tags.php

@@ -28 +28 @@
             /* translators: %s: Publish date. */
             esc_html__( 'Published %s', 'twentytwentyone' ),
-            $time_string // phpcs:ignore WordPress.Security.EscapeOutput
+            $time_string
         );
         echo '</span>';
@@ -80 +80 @@
             $post_format = get_post_format();
             if ( 'aside' === $post_format || 'status' === $post_format ) {
-                echo '<p><a href="' . esc_url( get_permalink() ) . '">' . twenty_twenty_one_continue_reading_text() . '</a></p>'; // phpcs:ignore WordPress.Security.EscapeOutput
+                echo '<p><a href="' . esc_url( get_permalink() ) . '">' . twenty_twenty_one_continue_reading_text() . '</a></p>';
             }
 
@@ -106 +106 @@
                         /* translators: %s: List of categories. */
                         '<span class="cat-links">' . esc_html__( 'Categorized as %s', 'twentytwentyone' ) . ' </span>',
-                        $categories_list // phpcs:ignore WordPress.Security.EscapeOutput
+                        $categories_list
                     );
                 }
@@ -115 +115 @@
                         /* translators: %s: List of tags. */
                         '<span class="tags-links">' . esc_html__( 'Tagged %s', 'twentytwentyone' ) . '</span>',
-                        $tags_list // phpcs:ignore WordPress.Security.EscapeOutput
+                        $tags_list
                     );
                 }
@@ -148 +148 @@
                         /* translators: %s: List of categories. */
                         '<span class="cat-links">' . esc_html__( 'Categorized as %s', 'twentytwentyone' ) . ' </span>',
-                        $categories_list // phpcs:ignore WordPress.Security.EscapeOutput
+                        $categories_list
                     );
                 }
@@ -157 +157 @@
                         /* translators: %s: List of tags. */
                         '<span class="tags-links">' . esc_html__( 'Tagged %s', 'twentytwentyone' ) . '</span>',
-                        $tags_list // phpcs:ignore WordPress.Security.EscapeOutput
+                        $tags_list
                     );
                 }

trunk/src/wp-content/themes/twentytwentyone/searchform.php

@@ -21 +21 @@
 $twentytwentyone_aria_label = ! empty( $args['aria_label'] ) ? 'aria-label="' . esc_attr( $args['aria_label'] ) . '"' : '';
 ?>
-<form role="search" <?php echo $twentytwentyone_aria_label; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Escaped above. ?> method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
+<form role="search" <?php echo $twentytwentyone_aria_label; ?> method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
     <label for="<?php echo esc_attr( $twentytwentyone_unique_id ); ?>"><?php _e( 'Search&hellip;', 'twentytwentyone' ); // phpcs:ignore: WordPress.Security.EscapeOutput.UnsafePrintingFunction -- core trusts translations ?></label>
     <input type="search" id="<?php echo esc_attr( $twentytwentyone_unique_id ); ?>" class="search-field" value="<?php echo get_search_query(); ?>" name="s" />

trunk/src/wp-content/themes/twentytwentyone/template-parts/header/site-branding.php

@@ -37 +37 @@
     <?php if ( $description && true === get_theme_mod( 'display_title_and_tagline', true ) ) : ?>
         <p class="site-description">
-            <?php echo $description; // phpcs:ignore WordPress.Security.EscapeOutput ?>
+            <?php echo $description; ?>
         </p>
     <?php endif; ?>

trunk/src/wp-content/themes/twentytwentyone/template-parts/header/site-nav.php

@@ -15 +15 @@
             <button id="primary-mobile-menu" class="button" aria-controls="primary-menu-list" aria-expanded="false">
                 <span class="dropdown-icon open"><?php esc_html_e( 'Menu', 'twentytwentyone' ); ?>
-                    <?php echo twenty_twenty_one_get_icon_svg( 'ui', 'menu' ); // phpcs:ignore WordPress.Security.EscapeOutput ?>
+                    <?php echo twenty_twenty_one_get_icon_svg( 'ui', 'menu' ); ?>
                 </span>
                 <span class="dropdown-icon close"><?php esc_html_e( 'Close', 'twentytwentyone' ); ?>
-                    <?php echo twenty_twenty_one_get_icon_svg( 'ui', 'close' ); // phpcs:ignore WordPress.Security.EscapeOutput ?>
+                    <?php echo twenty_twenty_one_get_icon_svg( 'ui', 'close' ); ?>
                 </span>
             </button><!-- #primary-mobile-menu -->