From cc68de7006edc8ee18d586c966ce360942643038 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Mon, 24 Nov 2014 05:22:23 +0000
Subject: [PATCH] Ensure the DocBlock directly precedes the hook line for the
 `post_edit_form_tag` action in wp-admin/edit-form-advanced.php.

This fixes the parser getting confused about which DocBlock belongs to which hook or function in this file.

See #30473.

Built from https://develop.svn.wordpress.org/trunk@30539


git-svn-id: http://core.svn.wordpress.org/trunk@30528 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/edit-form-advanced.php | 8 ++++----
 wp-includes/version.php         | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 6b33ca1417..a01ed2751d 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -398,16 +398,16 @@ if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create
 	<span class="hide-if-no-sessionstorage"><?php _e( 'We&#8217;re backing up this post in your browser, just in case.' ); ?></span>
 	</p>
 </div>
-<?php
+<form name="post" action="post.php" method="post" id="post"<?php
 /**
- * Fires inside the post editor <form> tag.
+ * Fires inside the post editor form tag.
  *
  * @since 3.0.0
  *
  * @param WP_Post $post Post object.
  */
-?>
-<form name="post" action="post.php" method="post" id="post"<?php do_action( 'post_edit_form_tag', $post ); ?>>
+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 ?>" />
 <input type="hidden" id="hiddenaction" name="action" value="<?php echo esc_attr( $form_action ) ?>" />
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b8e3276154..346368d0d8 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-beta2-30538';
+$wp_version = '4.1-beta2-30539';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.