Changeset 28449

Timestamp:

05/16/2014 03:37:53 PM (11 years ago)

Author:

wonderboymusic

Message:

Eliminate use of extract() in wp_widget_rss_form().

See #22400.

File:

• trunk/src/wp-includes/default-widgets.php (modified) (1 diff)

trunk/src/wp-includes/default-widgets.php

@@ -1107 +1107 @@
  */
 function wp_widget_rss_form( $args, $inputs = null ) {
-
     $default_inputs = array( 'url' => true, 'title' => true, 'items' => true, 'show_summary' => true, 'show_author' => true, 'show_date' => true );
     $inputs = wp_parse_args( $inputs, $default_inputs );
-    extract( $args );
-    extract( $inputs, EXTR_SKIP );
-
-    $number = esc_attr( $number );
-    $title  = esc_attr( $title );
-    $url    = esc_url( $url );
-    $items  = (int) $items;
-    if ( $items < 1 || 20 < $items )
+
+    $number = esc_attr( $args['number'] );
+    $title  = isset( $args['title'] ) ? esc_attr( $args['title'] ) : '';
+    $url    = isset( $args['url'] ) ? esc_url( $args['url'] ) : '';
+    $items  = isset( $args['items'] ) ? (int) $args['items'] : 0;
+    if ( $items < 1 || 20 < $items ) {
         $items  = 10;
-    $show_summary   = (int) $show_summary;
-    $show_author    = (int) $show_author;
-    $show_date      = (int) $show_date;
-
-    if ( !empty($error) )
-        echo '<p class="widget-error"><strong>' . sprintf( __('RSS Error: %s'), $error) . '</strong></p>';
+    }
+    $show_summary   = isset( $args['show_summary'] ) ? (int) $args['show_summary'] : (int) $inputs['show_summary'];
+    $show_author    = isset( $args['show_author'] ) ? (int) $args['show_author'] : (int) $inputs['show_author'];
+    $show_date      = isset( $args['show_date'] ) ? (int) $args['show_date'] : (int) $inputs['show_date'];
+
+    if ( ! empty( $args['error'] ) ) {
+        echo '<p class="widget-error"><strong>' . sprintf( __( 'RSS Error: %s' ), $args['error'] ) . '</strong></p>';
+    }
 
     if ( $inputs['url'] ) :