WordPress.org

Make WordPress Core


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.6/wp-includes/widgets.php

    r8250 r8568  
    5858    );
    5959
    60     $sidebar = array_merge($defaults, $args);
     60    $sidebar = array_merge($defaults, (array) $args);
    6161
    6262    $wp_registered_sidebars[$sidebar['id']] = $sidebar;
     
    10441044    extract($args, EXTR_SKIP);
    10451045    if ( is_numeric($widget_args) )
    1046         $widget_args = array( 'number' => $widegt_args );
     1046        $widget_args = array( 'number' => $widget_args );
    10471047    $widget_args = wp_parse_args( $widget_args, array( 'number' => -1 ) );
    10481048    extract($widget_args, EXTR_SKIP);
     
    11261126                $title = __('Untitled');
    11271127            $desc = '';
    1128                 if ( isset( $item['description'] ) && is_string( $item['description'] ) )
    1129                     $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['description'], ENT_QUOTES))));
    1130                 elseif ( isset( $item['summary'] ) && is_string( $item['summary'] ) )
    1131                     $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['summary'], ENT_QUOTES))));
    1132 
    11331128            $summary = '';
    11341129            if ( isset( $item['description'] ) && is_string( $item['description'] ) )
    1135                 $summary = $item['description'];
     1130                $desc = $summary = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['description'], ENT_QUOTES))));
    11361131            elseif ( isset( $item['summary'] ) && is_string( $item['summary'] ) )
    1137                 $summary = $item['summary'];
    1138 
    1139             $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($summary, ENT_QUOTES))));
     1132                $desc = $summary = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['summary'], ENT_QUOTES))));
    11401133
    11411134            if ( $show_summary ) {
Note: See TracChangeset for help on using the changeset viewer.