Ticket #58102: 58102-general-template.diff

src/wp-includes/general-template.php

@@ -355 +355 @@
         }
 
         if ( $args['echo'] ) {
-                echo $result;
+                echo esc_html( $result );
         } else {
-                return $result;
+                return esc_html( $result );
         }
 }
 
@@ -512 +512 @@
         $defaults = array(
                 'echo'           => true,
                 // Default 'redirect' value takes the user back to the request URI.
-                'redirect'       => ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'],
+                'redirect'       => ( is_ssl() ? 'https://' : 'http://' ) . sanitize_text_field( $_SERVER['HTTP_HOST'] ) . sanitize_text_field( $_SERVER['REQUEST_URI'] ),
                 'form_id'        => 'loginform',
                 'label_username' => __( 'Username or Email Address' ),
                 'label_password' => __( 'Password' ),
@@ -705 +705 @@
         $link = apply_filters( 'register', $link );
 
         if ( $echo ) {
-                echo $link;
+                echo esc_html( $link );
         } else {
-                return $link;
+                return esc_html( $link );
         }
 }