Ticket #46227: 46227.3.diff

src/wp-admin/plugins.php

@@ -346 +346 @@
                                 <p>
                                 <?php
                                 if ( $data_to_delete ) {
-                                        _e( 'Are you sure you wish to delete these files and data?' );
+                                        _e( 'Are you sure you want to delete these files and data?' );
                                 } else {
-                                        _e( 'Are you sure you wish to delete these files?' );
+                                        _e( 'Are you sure you want to delete these files?' );
                                 }
                                 ?>
                                 </p>

src/wp-includes/default-filters.php

@@ -294 +294 @@
 add_action( 'wp_head', 'wp_print_head_scripts', 9 );
 add_action( 'wp_head', 'wp_generator' );
 add_action( 'wp_head', 'rel_canonical' );
+add_action( 'wp_head', 'rel_feed_for_posts', 10, 0 );
 add_action( 'wp_head', 'wp_shortlink_wp_head', 10, 0 );
 add_action( 'wp_head', 'wp_custom_css_cb', 101 );
 add_action( 'wp_head', 'wp_site_icon', 99 );

src/wp-includes/general-template.php

@@ -4590 +4590 @@
 
         return $settings;
 }
+
+/**
+ * Adds a link rel=feed element to the home page when a static front page is set in Settings > Reading.
+ *
+ * See {@see 'wp_head'}.
+ *
+ * @since 5.2.3
+ */
+function rel_feed_for_posts() {
+        $page_for_posts = get_option( 'page_for_posts' );
+
+        if ( is_front_page() && ! is_home() ) {
+                echo '<link rel="feed" type="text/html" href="' . get_the_permalink( $page_for_posts ) . '" title="' . the_title_attribute( array( 'echo' => false, 'post' => $page_for_posts ) ) . '" />';
+        }
+}

src/wp-includes/script-loader.php

@@ -1445 +1445 @@
                         'themeDownloading'        => __( 'Downloading your new theme…' ),
                         'themePreviewWait'        => __( 'Setting up your live preview. This may take a bit.' ),
                         'revertingChanges'        => __( 'Reverting unpublished changes…' ),
-                        'trashConfirm'            => __( 'Are you sure you want to discard your unpublished changes?' ),
+                        'trashConfirm'            => __( 'Are you sure you’d like to discard your unpublished changes?' ),
                         /* translators: %s: Display name of the user who has taken over the changeset in customizer. */
                         'takenOverMessage'        => __( '%s has taken over and is currently customizing.' ),
                         /* translators: %s: URL to the Customizer to load the autosaved version */

tests/phpunit/tests/general/document-title.php

@@ -1 +1 @@
 <?php
 
 /**
- * A set of unit tests for functions in wp-includes/general-template.php
+ * A set of unit tests for testing the Document Title functions in wp-includes/general-template.php
  *
+ * @group general
  * @group template
  * @group document-title
+ * @ticket 46227
  */
 class Tests_General_DocumentTitle extends WP_UnitTestCase {
 
@@ -275 +277 @@
         function _change_title_separator( $sep ) {
                 return '%%';
         }
+
+        // Test adding custom feed link to the blog page in the header.
+        function test_add_feed_link_to_header_front_page() {
+                $test_title = 'Blog';
+                // create a sample blog page.
+                $blog_page_id = $this->factory->post->create(
+                        array(
+                                'post_title' => $test_title,
+                                'post_type'  => 'page',
+                        )
+                );
+
+                update_option( 'page_for_posts', $blog_page_id );
+                update_option( 'show_on_front', 'page' );
+
+                $this->go_to('/');
+
+                $doc = new DOMDocument();
+                $doc->preserveWhiteSpace = false;
+
+                $test_link_str = '<link rel="feed" type="text/html" href="' . get_the_permalink( $blog_page_id ) . '" title="' . the_title_attribute( array( 'echo' => false, 'post' => $blog_page_id ) ) . '" />';
+                $doc->loadHTML( $test_link_str );
+
+                $selector = new DOMXPath( $doc );
+                $result = $selector->query( "/html/head/link[@rel= 'feed']" );
+                $test_blog_title = $result->item(0)->getAttribute( 'title' );
+
+                $this->assertEquals( $test_blog_title, $test_title );
+        }
 }