Ticket #5607: remove_admin_notices7.diff

wp-admin/includes/template.php

@@ -200 +200 @@
 function wp_manage_posts_columns() {
         $posts_columns = array();
         $posts_columns['id'] = '<div style="text-align: center">' . __('ID') . '</div>';
-        if ( 'draft' === $_GET['post_status'] )
+        if ( isset($_GET['post_status']) && 'draft' === $_GET['post_status'] )
                 $posts_columns['modified'] = __('Modified');
-        elseif ( 'pending' === $_GET['post_status'] )
+        elseif ( isset($_GET['post_status']) && 'pending' === $_GET['post_status'] )
                 $posts_columns['modified'] = __('Submitted');
         else
                 $posts_columns['date'] = __('When');
         $posts_columns['title'] = __('Title');
         $posts_columns['categories'] = __('Categories');
-        if ( !in_array($_GET['post_status'], array('pending', 'draft', 'future')) )
+        if ( ! isset($_GET['post_status']) || !in_array($_GET['post_status'], array('pending', 'draft', 'future')) )
                 $posts_columns['comments'] = '<div style="text-align: center">' . __('Comments') . '</div>';
         $posts_columns['author'] = __('Author');
         $posts_columns = apply_filters('manage_posts_columns', $posts_columns);
@@ -320 +320 @@
         $url = $user_object->user_url;
         $short_url = str_replace( 'http://', '', $url );
         $short_url = str_replace( 'www.', '', $short_url );
+        $first_name = ( isset( $user_object->first_name ) ) ? $user_object->first_name : '';
+        $last_name = ( isset( $user_object->last_name ) ) ? $user_object->last_name : '';
         if ('/' == substr( $short_url, -1 ))
                 $short_url = substr( $short_url, 0, -1 );
         if ( strlen( $short_url ) > 35 )
@@ -328 +330 @@
         $r = "<tr id='user-$user_object->ID'$style>
                 <td><input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' /> <label for='user_{$user_object->ID}'>{$user_object->ID}</label></td>
                 <td><label for='user_{$user_object->ID}'><strong>$user_object->user_login</strong></label></td>
-                <td><label for='user_{$user_object->ID}'>$user_object->first_name $user_object->last_name</label></td>
+                <td><label for='user_{$user_object->ID}'>$first_name $last_name</label></td>
                 <td><a href='mailto:$email' title='" . sprintf( __('e-mail: %s' ), $email ) . "'>$email</a></td>
                 <td><a href='$url' title='website: $url'>$short_url</a></td>";
         $r .= "\n\t\t<td align='center'>";
@@ -546 +548 @@
         global $wp_locale, $post, $comment;
 
         if ( $for_post )
-                $edit = ( in_array($post->post_status, array('draft', 'pending') ) && (!$post->post_date || '0000-00-00 00:00:00' == $post->post_date ) ) ? false : true;
+                $edit = ( in_array($post->post_status, array('draft', 'pending') ) && (empty($post->post_date) || '0000-00-00 00:00:00' == $post->post_date ) ) ? false : true;
         
         $tab_index_attribute = '';
         if ( (int) $tab_index > 0 )
@@ -555 +557 @@
         echo '<fieldset><legend><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp"'.$tab_index_attribute.' /> <label for="timestamp">'.__( 'Edit timestamp' ).'</label></legend>';
 
         $time_adj = time() + (get_option( 'gmt_offset' ) * 3600 );
-        $post_date = ($for_post) ? $post->post_date : $comment->comment_date;
+        $post_date = ( ! empty( $post->post_date ) ) ? $post->post_date : null;
+        $comment_date = ( ! empty( $comment->comment_date ) ) ? $comment->comment_date : null;
+        $post_date = ($for_post) ? $post_date : $comment_date;
         $jj = ($edit) ? mysql2date( 'd', $post_date ) : gmdate( 'd', $time_adj );
         $mm = ($edit) ? mysql2date( 'm', $post_date ) : gmdate( 'm', $time_adj );
         $aa = ($edit) ? mysql2date( 'Y', $post_date ) : gmdate( 'Y', $time_adj );
@@ -732 +736 @@
 
 function wp_remember_old_slug() {
         global $post;
-        $name = attribute_escape($post->post_name); // just in case
+        $name = ( ! empty($post->post_name) ) ? attribute_escape($post->post_name) : ''; // just in case
         if ( strlen($name) )
                 echo '<input type="hidden" id="wp-old-slug" name="wp-old-slug" value="' . $name . '" />';
 }