Ticket #14584: 14584.diff

export.php

@@ -137 +137 @@
                 if ( seems_utf8( $str ) == false )
                         $str = utf8_encode( $str );
 
-                // $str = ent2ncr(esc_html($str));
+                $str = html_entity_decode($str);
                 $str = "<![CDATA[$str" . ( ( substr( $str, -1 ) == ']' ) ? ' ' : '') . "]]>";
 
                 return $str;
@@ -263 +263 @@
                         $term_name = sanitize_term_field( 'name', $term->name, $term->term_id, $term->taxonomy, $filter );
                         // Back compat.
                         if ( 'category' == $term->taxonomy )
-                                $the_list .= "\n\t\t<category><![CDATA[$term_name]]></category>\n";
+                                $the_list .= "\n\t\t<category>" . wxr_cdata($term_name) . "</category>\n";
                         elseif ( 'post_tag' == $term->taxonomy )
-                                $the_list .= "\n\t\t<category domain=\"$domain\"><![CDATA[$term_name]]></category>\n";
+                                $the_list .= "\n\t\t<category domain=\"$domain\">" . wxr_cdata($term_name) . "</category>\n";
                         // forwards compatibility as above
-                        $the_list .= "\n\t\t<category domain=\"$domain\" nicename=\"{$term->slug}\"><![CDATA[$term_name]]></category>\n";
+                        $the_list .= "\n\t\t<category domain=\"$domain\" nicename=\"{$term->slug}\">" . wxr_cdata($term_name) . "</category>\n";
                 }
                 echo $the_list;
         }
@@ -311 +311 @@
         <wp:base_site_url><?php echo wxr_site_url(); ?></wp:base_site_url>
         <wp:base_blog_url><?php bloginfo_rss( 'url' ); ?></wp:base_blog_url>
         <?php if ( $cats ) : foreach ( $cats as $c ) : ?>
-        <wp:category><wp:category_nicename><?php echo $c->slug; ?></wp:category_nicename><wp:category_parent><?php echo $c->parent ? $cats[$c->parent]->name : ''; ?></wp:category_parent><?php wxr_cat_name( $c ); ?><?php wxr_category_description( $c ); ?></wp:category>
+        <wp:category><wp:category_nicename><?php echo $c->slug; ?></wp:category_nicename><wp:category_parent><?php echo $c->parent ? wxr_cdata($cats[$c->parent]->name) : ''; ?></wp:category_parent><?php wxr_cat_name( $c ); ?><?php wxr_category_description( $c ); ?></wp:category>
         <?php endforeach; endif; ?>
         <?php if ( $tags ) : foreach ( $tags as $t ) : ?>
         <wp:tag><wp:tag_slug><?php echo $t->slug; ?></wp:tag_slug><?php wxr_tag_name( $t ); ?><?php wxr_tag_description( $t ); ?></wp:tag>