Ticket #46227: 46227.2.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

@@ -4583 +4583 @@
 
         return $settings;
 }
+
+/**
+ * Adds a link rel=feed element to the home page when a static front page is set in Settings > Reading
+ */
+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="' . get_the_title( $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

@@ -6 +6 @@
  * @group template
  * @group document-title
  */
-class Tests_General_DocumentTitle extends WP_UnitTestCase {
 
+namespace TestGeneralDocumentTitle;
+
+class Tests_General_DocumentTitle extends \WP_UnitTestCase {
+
         public $blog_name;
         public static $category_id;
         public static $author_id;
         public static $post_id;
 
-        public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+        public static function wpSetUpBeforeClass( \WP_UnitTest_Factory $factory ) {
                 self::$category_id = $factory->category->create(
                         array(
                                 'name' => 'test_category',
@@ -275 +278 @@
         function _change_title_separator( $sep ) {
                 return '%%';
         }
+
+        //Testing adding custom feed link to the blog page in the header.
+         function test_add_feed_link_to_header_front_page(){
+                 //craete a sample blog page.
+                 $blog_page_id = $this->factory->post->create(
+                         array(
+                'post_title' => 'Blog',
+                                'post_type'  => 'page', 
+                         )
+                 );
+                 //make it ablog homepage..
+                 update_option('page_for_posts', $blog_page_id);
+                 //by default blog page should not be the homepage(front page)
+                 update_option('show_on_front', 'page');
+                 //visit the front page.
+                 $this->go_to('/'); 
+                 $doc = new DOMDocument();
+                 
+                 $doc->preserveWhiteSpace = false;
+                 $str =  '<link rel="feed" type="text/html" href="http://localhost:8012/projects/wordpress-core/build/index.php/blog/" title="Blog" />';
+                 
+                  $test_link = $doc.loadHTML($str);
+                  $selector = new DOMXPath($test_link);
+                  
+                  $result = $selector->query('//<link[@rel= "feed"]');
+                 //get the attribute value from the title
+                   $testBlogTitle = $result->item(0)->getAttribute('title');
+                
+                  $this-> assertEquals($testBlogTitle, $this->blog_name);
+                 //$this->assertTrue($result);
+         }
 }