Changeset 24465 for branches/3.5

Timestamp:

06/21/2013 02:50:58 AM (12 years ago)

Author:

nacin

Message:

Pass $post to hooks in edit-form-advanced.php including edit_form_advanced and edit_form_after_*. fixes #24611.

Merges [24446] to the 3.5 branch.

Location:

branches/3.5

Files:

• . (modified) (1 prop)
• wp-admin/edit-form-advanced.php (modified) (7 diffs)
• wp-admin/includes/media.php (modified) (1 diff)

branches/3.5/wp-admin/edit-form-advanced.php

@@ -145 +145 @@
     add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', null, 'normal', 'core');
 
-do_action('dbx_post_advanced');
+do_action('dbx_post_advanced', $post);
 if ( post_type_supports($post_type, 'comments') )
     add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', null, 'normal', 'core');
@@ -297 +297 @@
 <div id="message" class="updated"><p><?php echo $message; ?></p></div>
 <?php endif; ?>
-<form name="post" action="post.php" method="post" id="post"<?php do_action('post_edit_form_tag'); ?>>
+<form name="post" action="post.php" method="post" id="post"<?php do_action('post_edit_form_tag', $post); ?>>
 <?php wp_nonce_field($nonce_action); ?>
 <input type="hidden" id="user-id" name="user_ID" value="<?php echo (int) $user_ID ?>" />
@@ -355 +355 @@
 }
 
-do_action( 'edit_form_after_title' );
+do_action( 'edit_form_after_title', $post );
 
 if ( post_type_supports($post_type, 'editor') ) {
@@ -384 +384 @@
 <?php } ?>
 
-<?php do_action( 'edit_form_after_editor' ); ?>
+<?php do_action( 'edit_form_after_editor', $post ); ?>
 </div><!-- /post-body-content -->
 
@@ -391 +391 @@
 
 if ( 'page' == $post_type )
-    do_action('submitpage_box');
+    do_action('submitpage_box', $post);
 else
-    do_action('submitpost_box');
+    do_action('submitpost_box', $post);
 
 do_meta_boxes($post_type, 'side', $post);
@@ -405 +405 @@
 
 if ( 'page' == $post_type )
-    do_action('edit_page_form');
+    do_action('edit_page_form', $post);
 else
-    do_action('edit_form_advanced');
+    do_action('edit_form_advanced', $post);
 
 do_meta_boxes(null, 'advanced', $post);
@@ -415 +415 @@
 <?php
 
-do_action('dbx_post_sidebar');
+do_action('dbx_post_sidebar', $post);
 
 ?>

branches/3.5/wp-admin/includes/media.php

@@ -2271 +2271 @@
  * @since 3.5.0
  */
-function edit_form_image_editor() {
-    $post = get_post();
-
+function edit_form_image_editor( $post ) {
     $open = isset( $_GET['image-editor'] );
     if ( $open )