WordPress.org

Make WordPress Core

Ticket #46227: 46227.3.diff

File 46227.3.diff, 4.5 KB (added by garrett-eclipse, 13 months ago)

Added @since to docblock and fixed the Unit Tests as they were failing.

  • src/wp-admin/plugins.php

     
    346346                                <p>
    347347                                <?php
    348348                                if ( $data_to_delete ) {
    349                                         _e( 'Are you sure you wish to delete these files and data?' );
     349                                        _e( 'Are you sure you want to delete these files and data?' );
    350350                                } else {
    351                                         _e( 'Are you sure you wish to delete these files?' );
     351                                        _e( 'Are you sure you want to delete these files?' );
    352352                                }
    353353                                ?>
    354354                                </p>
  • src/wp-includes/default-filters.php

     
    294294add_action( 'wp_head', 'wp_print_head_scripts', 9 );
    295295add_action( 'wp_head', 'wp_generator' );
    296296add_action( 'wp_head', 'rel_canonical' );
     297add_action( 'wp_head', 'rel_feed_for_posts', 10, 0 );
    297298add_action( 'wp_head', 'wp_shortlink_wp_head', 10, 0 );
    298299add_action( 'wp_head', 'wp_custom_css_cb', 101 );
    299300add_action( 'wp_head', 'wp_site_icon', 99 );
  • src/wp-includes/general-template.php

     
    45904590
    45914591        return $settings;
    45924592}
     4593
     4594/**
     4595 * Adds a link rel=feed element to the home page when a static front page is set in Settings > Reading.
     4596 *
     4597 * See {@see 'wp_head'}.
     4598 *
     4599 * @since 5.2.3
     4600 */
     4601function rel_feed_for_posts() {
     4602        $page_for_posts = get_option( 'page_for_posts' );
     4603
     4604        if ( is_front_page() && ! is_home() ) {
     4605                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 ) ) . '" />';
     4606        }
     4607}
  • src/wp-includes/script-loader.php

     
    14451445                        'themeDownloading'        => __( 'Downloading your new theme&hellip;' ),
    14461446                        'themePreviewWait'        => __( 'Setting up your live preview. This may take a bit.' ),
    14471447                        'revertingChanges'        => __( 'Reverting unpublished changes&hellip;' ),
    1448                         'trashConfirm'            => __( 'Are you sure you want to discard your unpublished changes?' ),
     1448                        'trashConfirm'            => __( 'Are you sure you&#8217;d like to discard your unpublished changes?' ),
    14491449                        /* translators: %s: Display name of the user who has taken over the changeset in customizer. */
    14501450                        'takenOverMessage'        => __( '%s has taken over and is currently customizing.' ),
    14511451                        /* translators: %s: URL to the Customizer to load the autosaved version */
  • tests/phpunit/tests/general/document-title.php

     
    11<?php
    22
    33/**
    4  * A set of unit tests for functions in wp-includes/general-template.php
     4 * A set of unit tests for testing the Document Title functions in wp-includes/general-template.php
    55 *
     6 * @group general
    67 * @group template
    78 * @group document-title
     9 * @ticket 46227
    810 */
    911class Tests_General_DocumentTitle extends WP_UnitTestCase {
    1012
     
    275277        function _change_title_separator( $sep ) {
    276278                return '%%';
    277279        }
     280
     281        // Test adding custom feed link to the blog page in the header.
     282        function test_add_feed_link_to_header_front_page() {
     283                $test_title = 'Blog';
     284                // create a sample blog page.
     285                $blog_page_id = $this->factory->post->create(
     286                        array(
     287                                'post_title' => $test_title,
     288                                'post_type'  => 'page',
     289                        )
     290                );
     291
     292                update_option( 'page_for_posts', $blog_page_id );
     293                update_option( 'show_on_front', 'page' );
     294
     295                $this->go_to('/');
     296
     297                $doc = new DOMDocument();
     298                $doc->preserveWhiteSpace = false;
     299
     300                $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 ) ) . '" />';
     301                $doc->loadHTML( $test_link_str );
     302
     303                $selector = new DOMXPath( $doc );
     304                $result = $selector->query( "/html/head/link[@rel= 'feed']" );
     305                $test_blog_title = $result->item(0)->getAttribute( 'title' );
     306
     307                $this->assertEquals( $test_blog_title, $test_title );
     308        }
    278309}