Changeset 25298

Timestamp:

09/07/2013 06:16:09 PM (10 years ago)

Author:

SergeyBiryukov

Message:

Avoid PHP notices when configuring the Incoming Links dashboard widget. fixes #25250.

Location:

trunk/src

Files:

• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-includes/default-widgets.php (modified) (2 diffs)

trunk/src/wp-admin/includes/dashboard.php

@@ -1096 +1096 @@
         $_POST['widget-rss'][$number] = wp_unslash( $_POST['widget-rss'][$number] );
         $widget_options[$widget_id] = wp_widget_rss_process( $_POST['widget-rss'][$number] );
+        $widget_options[$widget_id]['number'] = $number;
         // title is optional. If black, fill it if possible
         if ( !$widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title']) ) {

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

@@ -930 +930 @@
     $inputs = wp_parse_args( $inputs, $default_inputs );
     extract( $args );
-    extract( $inputs, EXTR_SKIP);
+    extract( $inputs, EXTR_SKIP );
 
     $number = esc_attr( $number );
@@ -1001 +1001 @@
     if ( $items < 1 || 20 < $items )
         $items = 10;
-    $url           = esc_url_raw(strip_tags( $widget_rss['url'] ));
-    $title         = trim(strip_tags( $widget_rss['title'] ));
-    $show_summary  = isset($widget_rss['show_summary']) ? (int) $widget_rss['show_summary'] : 0;
-    $show_author   = isset($widget_rss['show_author']) ? (int) $widget_rss['show_author'] :0;
-    $show_date     = isset($widget_rss['show_date']) ? (int) $widget_rss['show_date'] : 0;
+    $url           = esc_url_raw( strip_tags( $widget_rss['url'] ) );
+    $title         = isset( $widget_rss['title'] ) ? trim( strip_tags( $widget_rss['title'] ) ) : '';
+    $show_summary  = isset( $widget_rss['show_summary'] ) ? (int) $widget_rss['show_summary'] : 0;
+    $show_author   = isset( $widget_rss['show_author'] ) ? (int) $widget_rss['show_author'] :0;
+    $show_date     = isset( $widget_rss['show_date'] ) ? (int) $widget_rss['show_date'] : 0;
 
     if ( $check_feed ) {