Changeset 45216

Timestamp:

04/16/2019 03:56:48 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Export: Remove extra whitespace from <title>, <content:encoded>, and <excerpt:encoded> elements in WXR files.

Props sgastard, juliarrr, aristath, SergeyBiryukov.
Fixes #46575.

File:

• trunk/src/wp-admin/includes/export.php (modified) (3 diffs)

trunk/src/wp-admin/includes/export.php

@@ -531 +531 @@
                         foreach ( $posts as $post ) {
                                 setup_postdata( $post );
-                                $is_sticky = is_sticky( $post->ID ) ? 1 : 0;
-                                ?>
-        <item>
-                <title>
-                                <?php
+
                                 /** This filter is documented in wp-includes/feed.php */
-                                echo apply_filters( 'the_title_rss', $post->post_title );
-                                ?>
-                </title>
-                <link><?php the_permalink_rss(); ?></link>
-                <pubDate><?php echo mysql2date( 'D, d M Y H:i:s +0000', get_post_time( 'Y-m-d H:i:s', true ), false ); ?></pubDate>
-                <dc:creator><?php echo wxr_cdata( get_the_author_meta( 'login' ) ); ?></dc:creator>
-                <guid isPermaLink="false"><?php the_guid(); ?></guid>
-                <description></description>
-                <content:encoded>
-                                <?php
+                                $title = apply_filters( 'the_title_rss', $post->post_title );
+
                                 /**
                                  * Filters the post content used for WXR exports.
@@ -554 +542 @@
                                  * @param string $post_content Content of the current post.
                                  */
-                                echo wxr_cdata( apply_filters( 'the_content_export', $post->post_content ) );
-                                ?>
-                </content:encoded>
-                <excerpt:encoded>
-                                <?php
+                                $content = wxr_cdata( apply_filters( 'the_content_export', $post->post_content ) );
+
                                 /**
                                  * Filters the post excerpt used for WXR exports.
@@ -566 +551 @@
                                  * @param string $post_excerpt Excerpt for the current post.
                                  */
-                                echo wxr_cdata( apply_filters( 'the_excerpt_export', $post->post_excerpt ) );
+                                $excerpt = wxr_cdata( apply_filters( 'the_excerpt_export', $post->post_excerpt ) );
+
+                                $is_sticky = is_sticky( $post->ID ) ? 1 : 0;
                                 ?>
-                </excerpt:encoded>
+        <item>
+                <title><?php echo $title; ?></title>
+                <link><?php the_permalink_rss(); ?></link>
+                <pubDate><?php echo mysql2date( 'D, d M Y H:i:s +0000', get_post_time( 'Y-m-d H:i:s', true ), false ); ?></pubDate>
+                <dc:creator><?php echo wxr_cdata( get_the_author_meta( 'login' ) ); ?></dc:creator>
+                <guid isPermaLink="false"><?php the_guid(); ?></guid>
+                <description></description>
+                <content:encoded><?php echo $content; ?></content:encoded>
+                <excerpt:encoded><?php echo $excerpt; ?></excerpt:encoded>
                 <wp:post_id><?php echo intval( $post->ID ); ?></wp:post_id>
                 <wp:post_date><?php echo wxr_cdata( $post->post_date ); ?></wp:post_date>