Ticket #7375: 7375.diff

wp-includes/widgets.php

@@ -1125 +1125 @@
                         if ( empty($title) )
                                 $title = __('Untitled');
                         $desc = '';
-                                if ( isset( $item['description'] ) && is_string( $item['description'] ) )
-                                        $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['description'], ENT_QUOTES))));
-                                elseif ( isset( $item['summary'] ) && is_string( $item['summary'] ) )
-                                        $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['summary'], ENT_QUOTES))));
-
                         $summary = '';
                         if ( isset( $item['description'] ) && is_string( $item['description'] ) )
-                                $summary = $item['description'];
+                                $desc = $summary = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['description'], ENT_QUOTES))));
                         elseif ( isset( $item['summary'] ) && is_string( $item['summary'] ) )
-                                $summary = $item['summary'];
+                                $desc = $summary = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['summary'], ENT_QUOTES))));
 
-                        $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($summary, ENT_QUOTES))));
-
                         if ( $show_summary ) {
                                 $desc = '';
                                 $summary = wp_specialchars( $summary );