Ticket #5607: remove_admin_notices6.diff

wp-admin/includes/plugin.php

@@ -18 +18 @@
         $name = $plugin_name[1];
         $name = trim( $name );
         $plugin = $name;
-        if ('' != trim($plugin_uri[1]) && '' != $name ) {
+        if (isset($plugin_uri[1]) && '' != trim($plugin_uri[1]) && '' != $name ) {
                 $plugin = '<a href="' . trim( $plugin_uri[1] ) . '" title="'.__( 'Visit plugin homepage' ).'">'.$plugin.'</a>';
         }
 
-        if ('' == $author_uri[1] ) {
+        if (! isset($author_uri[1]) || '' == $author_uri[1] ) {
                 $author = trim( $author_name[1] );
         } else {
                 $author = '<a href="' . trim( $author_uri[1] ) . '" title="'.__( 'Visit author homepage' ).'">' . trim( $author_name[1] ) . '</a>';

wp-admin/includes/theme.php

@@ -38 +38 @@
                         preg_match( '|Template Name:(.*)$|mi', $template_data, $name );
                         preg_match( '|Description:(.*)$|mi', $template_data, $description );
 
-                        $name = $name[1];
-                        $description = $description[1];
+                        $name = ( isset($name[1]) ) ? $name[1] : null;
+                        $description = ( isset($description[1]) ) ? $description[1] : null;
 
                         if ( !empty( $name ) ) {
                                 $page_templates[trim( $name )] = basename( $template );

wp-admin/includes/widgets.php

@@ -146 +146 @@
 function wp_widget_control( $key, $widget, $display = 'display' ) {
         static $i = 0;
         global $wp_registered_widgets, $wp_registered_widget_controls;
-        $control = $wp_registered_widget_controls[$widget];
-        $widget  = $wp_registered_widgets[$widget];
+        $control = (isset($wp_registered_widget_controls[$widget])) ? $wp_registered_widget_controls[$widget] : null;
+        $widget  = (isset($wp_registered_widgets[$widget])) ? $wp_registered_widgets[$widget] : null;
 
-        $id_format = $widget['id'];
+        $id_format = ( isset($widget['id']) ) ? $widget['id'] : null;
         if ( 'template' == $display && isset($control['params'][0]['number']) ) {
                 // number == -1 implies a template where id numbers are replaced by a generic '%i%'
                 $control['params'][0]['number'] = -1;