Changeset 53157 for trunk/src/wp-includes/blocks/page-list.php

Timestamp:

04/12/2022 03:10:30 PM (3 years ago)

Author:

gziolo

Message:

Editor: Update WordPress packages based based on Gutenberg v13.0 RC3

This is the last step of backports from the Gutenberg plugin for WordPress 6.0 Beta 1 release. It includes all updates WordPress packages published to npm based on the Gutenberg plugin v13.0 RC3 release. This patch also includes all the necessary changes applied to core blocks. New blocks included:

• Avatar
• Comment Author Name
• Comment Content
• Comment Date
• Comment Edit Link
• Comment Rely Link
• Comment Template
• Comments Pagination
• Comments Pagination Next
• Comments Pagination Previous
• Comments Query Loop
• Home Link
• Post Author Biography
• Query No Results
• Read More

See more details in ​https://github.com/WordPress/wordpress-develop/pull/2564.

Props zieladam, ramonopoly, ocean90.
Fixes #55505.

File:

• trunk/src/wp-includes/blocks/page-list.php (modified) (4 diffs)

trunk/src/wp-includes/blocks/page-list.php

@@ -179 +179 @@
         }
 
-        $title      = wp_kses( $page['title'], wp_kses_allowed_html( 'post' ) );
+        $title      = wp_kses_post( $page['title'] );
         $aria_label = sprintf(
             /* translators: Accessibility text. %s: Parent page title. */
@@ -186 +186 @@
         );
 
-        $markup .= '<li class="wp-block-pages-list__item' . $css_class . '"' . $style_attribute . '>';
+        $markup .= '<li class="wp-block-pages-list__item' . esc_attr( $css_class ) . '"' . $style_attribute . '>';
 
         if ( isset( $page['children'] ) && $is_navigation_child && $open_submenus_on_click ) {
-            $markup .= '<button aria-label="' . $aria_label . '" class="' . $navigation_child_content_class . ' wp-block-navigation-submenu__toggle" aria-expanded="false">' . $title . '<span class="wp-block-page-list__submenu-icon wp-block-navigation__submenu-icon"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" role="img" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg></span>' .
-            '</button>';
+            $markup .= '<button aria-label="' . esc_attr( $aria_label ) . '" class="' . esc_attr( $navigation_child_content_class ) . ' wp-block-navigation-submenu__toggle" aria-expanded="false">' . esc_html( $title ) .
+            '</button>' . '<span class="wp-block-page-list__submenu-icon wp-block-navigation__submenu-icon"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg></span>';
         } else {
-            $markup .= '<a class="wp-block-pages-list__item__link' . $navigation_child_content_class . '" href="' . esc_url( $page['link'] ) . '"' . $aria_current . '>' . $title . '</a>';
+            $markup .= '<a class="wp-block-pages-list__item__link' . esc_attr( $navigation_child_content_class ) . '" href="' . esc_url( $page['link'] ) . '"' . $aria_current . '>' . $title . '</a>';
         }
 
         if ( isset( $page['children'] ) ) {
             if ( $is_navigation_child && $show_submenu_icons && ! $open_submenus_on_click ) {
-                $markup .= '<button aria-label="' . $aria_label . '" class="wp-block-navigation__submenu-icon wp-block-navigation-submenu__toggle" aria-expanded="false">';
-                $markup .= '<span class="wp-block-page-list__submenu-icon wp-block-navigation__submenu-icon"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" role="img" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg></span>';
+                $markup .= '<button aria-label="' . esc_attr( $aria_label ) . '" class="wp-block-navigation__submenu-icon wp-block-navigation-submenu__toggle" aria-expanded="false">';
+                $markup .= '<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg>';
                 $markup .= '</button>';
             }
@@ -236 +236 @@
  * Renders the `core/page-list` block on server.
  *
- * @param array $attributes The block attributes.
- * @param array $content The saved content.
- * @param array $block The parsed block.
+ * @param array    $attributes The block attributes.
+ * @param string   $content    The saved content.
+ * @param WP_Block $block      The parsed block.
  *
  * @return string Returns the page list markup.
@@ -253 +253 @@
     );
 
-    // If thare are no pages, there is nothing to show.
+    // If there are no pages, there is nothing to show.
     if ( empty( $all_pages ) ) {
         return;