From bfa3b629e0d67016ec83050c5db762479af40609 Mon Sep 17 00:00:00 2001 From: donncha Date: Wed, 13 Aug 2008 15:13:05 +0000 Subject: Merge with WP revision 8635 git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1421 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-includes/widgets.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'wp-includes/widgets.php') diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php index 6d1c5d4..2a71a02 100644 --- a/wp-includes/widgets.php +++ b/wp-includes/widgets.php @@ -57,7 +57,7 @@ function register_sidebar($args = array()) { 'after_title' => "\n", ); - $sidebar = array_merge($defaults, $args); + $sidebar = array_merge($defaults, (array) $args); $wp_registered_sidebars[$sidebar['id']] = $sidebar; @@ -1125,18 +1125,11 @@ function wp_widget_rss_output( $rss, $args = array() ) { 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 = 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 ) { $desc = ''; -- cgit