<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[24465] branches/3.5: Pass $post to hooks in edit-form-advanced.php including edit_form_advanced and edit_form_after_*.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24465">24465</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-06-21 02:50:58 +0000 (Fri, 21 Jun 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pass $post to hooks in edit-form-advanced.php including edit_form_advanced and edit_form_after_*. fixes <a href="http://core.trac.wordpress.org/ticket/24611">#24611</a>.
Merges <a href="http://core.trac.wordpress.org/changeset/24446">[24446]</a> to the 3.5 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches35wpadmineditformadvancedphp">branches/3.5/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#branches35wpadminincludesmediaphp">branches/3.5/wp-admin/includes/media.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches35">branches/3.5/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/3.5
</span><span class="cx">===================================================================
</span><del>--- branches/3.5 2013-06-21 02:31:39 UTC (rev 24464)
</del><ins>+++ branches/3.5 2013-06-21 02:50:58 UTC (rev 24465)
</ins><a id="branches35"></a>
<div class="propset"><h4>Property changes: branches/3.5</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/3.1:18031
</span><span class="cx"> /branches/3.3:20543
</span><span class="cx"> /branches/3.4:21757
</span><del>-/trunk:18512,23133-23135,23139,23185,23245,23263-23264,23267,23664,23902,24436,24442,24444,24448,24457,24459,24461,24463
</del><ins>+/trunk:18512,23133-23135,23139,23185,23245,23263-23264,23267,23664,23902,24436,24442,24444,24446,24448,24457,24459,24461,24463
</ins><span class="cx">\ No newline at end of property
</span><a id="branches35wpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: branches/3.5/wp-admin/edit-form-advanced.php (24464 => 24465)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.5/wp-admin/edit-form-advanced.php 2013-06-21 02:31:39 UTC (rev 24464)
+++ branches/3.5/wp-admin/edit-form-advanced.php 2013-06-21 02:50:58 UTC (rev 24465)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> if ( post_type_supports($post_type, 'custom-fields') )
</span><span class="cx"> add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', null, 'normal', 'core');
</span><span class="cx">
</span><del>-do_action('dbx_post_advanced');
</del><ins>+do_action('dbx_post_advanced', $post);
</ins><span class="cx"> if ( post_type_supports($post_type, 'comments') )
</span><span class="cx"> add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', null, 'normal', 'core');
</span><span class="cx">
</span><span class="lines">@@ -296,7 +296,7 @@
</span><span class="cx"> <?php if ( $message ) : ?>
</span><span class="cx"> <div id="message" class="updated"><p><?php echo $message; ?></p></div>
</span><span class="cx"> <?php endif; ?>
</span><del>-<form name="post" action="post.php" method="post" id="post"<?php do_action('post_edit_form_tag'); ?>>
</del><ins>+<form name="post" action="post.php" method="post" id="post"<?php do_action('post_edit_form_tag', $post); ?>>
</ins><span class="cx"> <?php wp_nonce_field($nonce_action); ?>
</span><span class="cx"> <input type="hidden" id="user-id" name="user_ID" value="<?php echo (int) $user_ID ?>" />
</span><span class="cx"> <input type="hidden" id="hiddenaction" name="action" value="<?php echo esc_attr( $form_action ) ?>" />
</span><span class="lines">@@ -354,7 +354,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><del>-do_action( 'edit_form_after_title' );
</del><ins>+do_action( 'edit_form_after_title', $post );
</ins><span class="cx">
</span><span class="cx"> if ( post_type_supports($post_type, 'editor') ) {
</span><span class="cx"> ?>
</span><span class="lines">@@ -383,16 +383,16 @@
</span><span class="cx"> </div>
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><del>-<?php do_action( 'edit_form_after_editor' ); ?>
</del><ins>+<?php do_action( 'edit_form_after_editor', $post ); ?>
</ins><span class="cx"> </div><!-- /post-body-content -->
</span><span class="cx">
</span><span class="cx"> <div id="postbox-container-1" class="postbox-container">
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> if ( 'page' == $post_type )
</span><del>- do_action('submitpage_box');
</del><ins>+ do_action('submitpage_box', $post);
</ins><span class="cx"> else
</span><del>- do_action('submitpost_box');
</del><ins>+ do_action('submitpost_box', $post);
</ins><span class="cx">
</span><span class="cx"> do_meta_boxes($post_type, 'side', $post);
</span><span class="cx">
</span><span class="lines">@@ -404,9 +404,9 @@
</span><span class="cx"> do_meta_boxes(null, 'normal', $post);
</span><span class="cx">
</span><span class="cx"> if ( 'page' == $post_type )
</span><del>- do_action('edit_page_form');
</del><ins>+ do_action('edit_page_form', $post);
</ins><span class="cx"> else
</span><del>- do_action('edit_form_advanced');
</del><ins>+ do_action('edit_form_advanced', $post);
</ins><span class="cx">
</span><span class="cx"> do_meta_boxes(null, 'advanced', $post);
</span><span class="cx">
</span><span class="lines">@@ -414,7 +414,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>-do_action('dbx_post_sidebar');
</del><ins>+do_action('dbx_post_sidebar', $post);
</ins><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx"> </div><!-- /post-body -->
</span></span></pre></div>
<a id="branches35wpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: branches/3.5/wp-admin/includes/media.php (24464 => 24465)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.5/wp-admin/includes/media.php 2013-06-21 02:31:39 UTC (rev 24464)
+++ branches/3.5/wp-admin/includes/media.php 2013-06-21 02:50:58 UTC (rev 24465)
</span><span class="lines">@@ -2270,9 +2270,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.5.0
</span><span class="cx"> */
</span><del>-function edit_form_image_editor() {
- $post = get_post();
-
</del><ins>+function edit_form_image_editor( $post ) {
</ins><span class="cx"> $open = isset( $_GET['image-editor'] );
</span><span class="cx"> if ( $open )
</span><span class="cx"> require_once ABSPATH . 'wp-admin/includes/image-edit.php';
</span></span></pre>
</div>
</div>
</body>
</html>