Ticket #5607: remove_admin_notices12.diff

wp-admin/edit-form-advanced.php

@@ -17 +17 @@
 <div class="wrap">
 <?php
 
-if (0 == $post_ID) {
+if (! isset($post_ID) || 0 == $post_ID) {
         $form_action = 'post';
         $temp_ID = -1 * time(); // don't change this formula without looking at wp_write_post()
         $form_extra = "<input type='hidden' id='post_ID' name='temp_ID' value='$temp_ID' />";
@@ -33 +33 @@
 
 $form_prevstatus = '<input type="hidden" name="prev_status" value="' . attribute_escape( $post->post_status ) . '" />';
 
-$form_trackback = '<input type="text" name="trackback_url" style="width: 415px" id="trackback" tabindex="7" value="'. attribute_escape( str_replace("\n", ' ', $post->to_ping) ) .'" />';
+$form_trackback = '<input type="text" name="trackback_url" style="width: 415px" id="trackback" tabindex="7" value="'. ((isset($post->to_ping)) ? attribute_escape( str_replace("\n", ' ', $post->to_ping) ) : '').'" />';
 
-if ('' != $post->pinged) {
+if (isset($post->pinged) && '' != $post->pinged) {
         $pings = '<p>'. __('Already pinged:') . '</p><ul>';
         $already_pinged = explode("\n", trim($post->pinged));
         foreach ($already_pinged as $pinged_url) {
@@ -53 +53 @@
 <input type="hidden" id="user-id" name="user_ID" value="<?php echo (int) $user_ID ?>" />
 <input type="hidden" id="hiddenaction" name="action" value="<?php echo $form_action ?>" />
 <input type="hidden" id="originalaction" name="originalaction" value="<?php echo $form_action ?>" />
-<input type="hidden" name="post_author" value="<?php echo attribute_escape( $post->post_author ); ?>" />
+<input type="hidden" name="post_author" value="<?php echo ( (isset($post->post_author)) ? attribute_escape( $post->post_author ) : ''); ?>" />
 <input type="hidden" id="post_type" name="post_type" value="post" />
 
 <?php echo $form_extra ?>
@@ -82 +82 @@
 <?php echo $form_prevstatus ?>
 
 <p class="submit">
-<?php if ( 'publish' == $post->post_status ) { ?>
+<?php if ( isset($post->post_status) && 'publish' == $post->post_status ) { ?>
 <a href="<?php echo clean_url(get_permalink($post->ID)); ?>" class="view-link" target="_blank"><?php _e('View &raquo;'); ?></a>
-<?php } elseif ( 'edit' == $action ) { ?>
+<?php } elseif ( isset($action) && 'edit' == $action ) { ?>
 <a href="<?php echo clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" class="view-link" target="_blank"><?php _e('Preview &raquo;'); ?></a>
 <?php } ?>
 <span id="autosave"></span>
@@ -104 +104 @@
 <input name="referredby" type="hidden" id="referredby" value="<?php
 if ( !empty($_REQUEST['popupurl']) )
         echo clean_url(stripslashes($_REQUEST['popupurl']));
-else if ( url_to_postid(wp_get_referer()) == $post_ID )
+else if ( isset($post_ID) && url_to_postid(wp_get_referer()) == $post_ID )
         echo 'redo';
 else
         echo clean_url(stripslashes(wp_get_referer()));
@@ -113 +113 @@
 <div id="tagsdiv" class="postbox">
 <h3><?php _e('Tags'); ?></h3>
 <div class="inside">
-<p id="jaxtag"><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post_ID ); ?>" /></p>
+<p id="jaxtag"><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( (isset($post_ID)) ? $post_ID : null ); ?>" /></p>
 <p id="tagchecklist"></p>
 </div>
 </div>
@@ -191 +191 @@
 <div id="passworddiv" class="postbox">
 <h3><?php _e('Post Password') ?></h3>
 <div class="inside">
-<input name="post_password" type="text" size="13" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" />
+<input name="post_password" type="text" size="13" id="post_password" value="<?php echo (! empty($post->post_password) ) ? attribute_escape( $post->post_password ) : ''; ?>" />
 </div>
 </div>
 
 <div id="slugdiv" class="postbox">
 <h3><?php _e('Post Slug') ?></h3>
 <div class="inside">
-<input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" />
+<input name="post_name" type="text" size="13" id="post_name" value="<?php echo ( ! empty($post->post_name) ) ? attribute_escape( $post->post_name ) : ''; ?>" />
 </div>
 </div>
 
@@ -217 +217 @@
 <?php if ( current_user_can('edit_posts') ) : ?>
 <div id="posttimestampdiv" class="postbox">
 <h3><?php _e('Post Timestamp'); ?></h3>
-<div class="inside"><?php touch_time(($action == 'edit')); ?></div>
+<div class="inside"><?php touch_time( ( ! empty($action) && $action == 'edit' ) ? true : false ); ?></div>
 </div>
 <?php endif; ?>
 
 <?php
 $authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM
-if ( $post->post_author && !in_array($post->post_author, $authors) )
+if ( ! empty($post->post_author) && !in_array($post->post_author, $authors) )
         $authors[] = $post->post_author;
 if ( $authors && count( $authors ) > 1 ) :
 ?>
@@ -239 +239 @@
 
 </div>
 
-<?php if ('edit' == $action) : $delete_nonce = wp_create_nonce( 'delete-post_' . $post_ID ); ?>
+<?php if (! empty($action) && 'edit' == $action) : $delete_nonce = wp_create_nonce( 'delete-post_' . $post_ID ); ?>
 <input name="deletepost" class="button delete" type="submit" id="deletepost" tabindex="10" value="<?php echo ( 'draft' == $post->post_status ) ? __('Delete this draft') : __('Delete this post'); ?>" <?php echo "onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n  'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this post '%s'\n  'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { document.forms.post._wpnonce.value = '$delete_nonce'; return true;}return false;\""; ?> />
 <?php endif; ?>