Changes from trunk/wp-includes/widgets.php at r8250 to branches/2.6/wp-includes/widgets.php at r8568

File:

• branches/2.6/wp-includes/widgets.php (modified) (3 diffs)

branches/2.6/wp-includes/widgets.php

@@ -58 +58 @@
         );
 
-        $sidebar = array_merge($defaults, $args);
+        $sidebar = array_merge($defaults, (array) $args);
 
         $wp_registered_sidebars[$sidebar['id']] = $sidebar;
@@ -1044 +1044 @@
         extract($args, EXTR_SKIP);
         if ( is_numeric($widget_args) )
-                $widget_args = array( 'number' => $widegt_args );
+                $widget_args = array( 'number' => $widget_args );
         $widget_args = wp_parse_args( $widget_args, array( 'number' => -1 ) );
         extract($widget_args, EXTR_SKIP);
@@ -1126 +1126 @@
                                 $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 = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($summary, ENT_QUOTES))));
+                                $desc = $summary = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['summary'], ENT_QUOTES))));
 
                         if ( $show_summary ) {