Ticket #44383: 44383.1.diff

src/wp-admin/includes/media.php

@@ -620 +620 @@
          *
          * @param string $string Media buttons context. Default empty.
          */
-        $legacy_filter = apply_filters( 'media_buttons_context', '' );
+        $legacy_filter = apply_filters_deprecated( 'media_buttons_context', array(), '3.5.0', false, __( 'Please use "media_buttons" action instead.' ) );
 
         if ( $legacy_filter ) {
                 // #WP22559. Close <a> if a plugin started by closing <a> to open their own <a> tag.

src/wp-admin/privacy.php

@@ -155 +155 @@
                 <p class="tools-privacy-edit"><strong>
                         <?php
 
-                        /* translators: 1: URL to edit page, 2: URL to view page */
-                        printf( __( '<a href="%1$s">Edit</a> or <a href="%2$s">view</a> your privacy policy page content.' ), $edit_href, $view_href );
+                        if ( 'publish' === get_post_status( $privacy_policy_page_id ) ) {
+                                /* translators: 1: URL to edit page, 2: URL to view page */
+                                printf( __( '<a href="%1$s">Edit</a> or <a href="%2$s">view</a> your privacy policy page content.' ), $edit_href, $view_href );
+                        } else {
+                                /* translators: 1: URL to edit page, 2: URL to preview page */
+                                printf( __( '<a href="%1$s">Edit</a> or <a href="%2$s">preview</a> your privacy policy page content.' ), $edit_href, $view_href );
+                        }
 
                         ?>
                 </strong></p>

src/wp-includes/comment-template.php

@@ -2262 +2262 @@
         $req      = get_option( 'require_name_email' );
         $html_req = ( $req ? " required='required'" : '' );
         $html5    = 'html5' === $args['format'];
-        $consent  = empty( $commenter['comment_author_email'] ) ? '' : ' checked="checked"';
         $fields   = array(
                 'author'  => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
                                          '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" maxlength="245"' . $html_req . ' /></p>',
@@ -2270 +2269 @@
                                          '<input id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="30" maxlength="100" aria-describedby="email-notes"' . $html_req . ' /></p>',
                 'url'     => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label> ' .
                                          '<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>',
-                'cookies' => '<p class="comment-form-cookies-consent"><input id="wp-comment-cookies-consent" name="wp-comment-cookies-consent" type="checkbox" value="yes"' . $consent . ' />' .
-                                         '<label for="wp-comment-cookies-consent">' . __( 'Save my name, email, and website in this browser for the next time I comment.' ) . '</label></p>',
         );
 
+        if ( has_action( 'set_comment_cookies', 'wp_set_comment_cookies' ) ) {
+                $consent           = empty( $commenter['comment_author_email'] ) ? '' : ' checked="checked"';
+                $fields['cookies'] = '<p class="comment-form-cookies-consent"><input id="wp-comment-cookies-consent" name="wp-comment-cookies-consent" type="checkbox" value="yes"' . $consent . ' />' .
+                                                         '<label for="wp-comment-cookies-consent">' . __( 'Save my name, email, and website in this browser for the next time I comment.' ) . '</label></p>';
+        }
+
         $required_text = sprintf( ' ' . __( 'Required fields are marked %s' ), '<span class="required">*</span>' );
 
         /**

src/wp-includes/user.php

@@ -2973 +2973 @@
                 return;
         }
 
-        $subject = sprintf(
-                /* translators: %s Site name. */
-                __( '[%s] Action Confirmed' ),
-                wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES )
-        );
-
         $manage_url = add_query_arg( 'page', $request_data->action_name, admin_url( 'tools.php' ) );
 
         /**
@@ -3049 +3043 @@
          *     @type string          $manage_url  The link to click manage privacy requests of this type.
          *     @type string          $sitename    The site name sending the mail.
          *     @type string          $siteurl     The site URL sending the mail.
+         *     @type string          $admin_email The administrator email receiving the mail.
          * }
          */
         $content = apply_filters( 'user_confirmed_action_email_content', $email_text, $email_data );
@@ -3059 +3054 @@
         $content = str_replace( '###MANAGE_URL###', esc_url_raw( $email_data['manage_url'] ), $content );
         $content = str_replace( '###SITEURL###', esc_url_raw( $email_data['siteurl'] ), $content );
 
+        $blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+
+        $subject = sprintf(
+                /* translators: %s Site name. */
+                __( '[%s] Action Confirmed' ),
+                $blogname
+        );
+
+        /**
+         * Filters the subject of the user request confirmation email.
+         *
+         * @since 4.9.7
+         *
+         * @param string $subject    The email subject.
+         * @param string $blogname   The name of the site.
+         * @param array  $email_data {
+         *     Data relating to the account action email.
+         *
+         *     @type WP_User_Request $request     User request object.
+         *     @type string          $user_email  The email address confirming a request
+         *     @type string          $description Description of the action being performed so the user knows what the email is for.
+         *     @type string          $manage_url  The link to click manage privacy requests of this type.
+         *     @type string          $sitename    The site name sending the mail.
+         *     @type string          $siteurl     The site URL sending the mail.
+         *     @type string          $admin_email The administrator email receiving the mail.
+         * }
+         */
+        $subject = apply_filters( 'user_request_confirmed_email_subject', $subject, $blogname, $email_data );
+
         $email_sent = wp_mail( $email_data['admin_email'], $subject, $content );
 
         if ( $email_sent ) {

tests/phpunit/tests/comment.php

@@ -1156 +1156 @@
                 $this->assertSame( $expected['comment_agent'], $actual['data'][0]['data'][4]['value'] );
                 $this->assertSame( $expected['comment_date'], $actual['data'][0]['data'][5]['value'] );
                 $this->assertSame( $expected['comment_content'], $actual['data'][0]['data'][6]['value'] );
-                $this->assertSame( get_comment_link( $comment_id ), strip_tags( $actual['data'][0]['data'][7]['value'] ) );
+                $this->assertSame( esc_html( get_comment_link( $comment_id ) ), strip_tags( $actual['data'][0]['data'][7]['value'] ) );
         }
 
         /**