From 157f811a5e1d48bb340d5ac2743b34e9055f123c Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Thu, 15 May 2014 19:36:15 +0000 Subject: [PATCH] Eliminate use of `extract()` in `WP_Widget_RSS::widget()`. See #22400. Built from https://develop.svn.wordpress.org/trunk@28439 git-svn-id: http://core.svn.wordpress.org/trunk@28266 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/default-widgets.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/wp-includes/default-widgets.php b/wp-includes/default-widgets.php index c010890f3b..aaa9356fdb 100644 --- a/wp-includes/default-widgets.php +++ b/wp-includes/default-widgets.php @@ -929,8 +929,6 @@ class WP_Widget_RSS extends WP_Widget { if ( isset($instance['error']) && $instance['error'] ) return; - extract($args, EXTR_SKIP); - $url = ! empty( $instance['url'] ) ? $instance['url'] : ''; while ( stristr($url, 'http') != $url ) $url = substr($url, 1); @@ -967,11 +965,12 @@ class WP_Widget_RSS extends WP_Widget { if ( $title ) $title = "RSS $title"; - echo $before_widget; - if ( $title ) - echo $before_title . $title . $after_title; + echo $args['before_widget']; + if ( $title ) { + echo $args['before_title'] . $title . $args['after_title']; + } wp_widget_rss_output( $rss, $instance ); - echo $after_widget; + echo $args['after_widget']; if ( ! is_wp_error($rss) ) $rss->__destruct();