From 4f7856aabeb1c93debd2cae50d9d545805c3abdd Mon Sep 17 00:00:00 2001
From: Dion Hulse <wordpress@dd32.id.au>
Date: Mon, 9 Mar 2015 06:43:26 +0000
Subject: [PATCH] Fix the editable_slug hook documentation, the PHPDoc must
 come directly before the hook call, with no HTML inbetween. Props
 DrewAPicture. Fixes #31569

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


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

diff --git a/wp-admin/edit-tag-form.php b/wp-admin/edit-tag-form.php
index 73db25b00f..0b00ded844 100644
--- a/wp-admin/edit-tag-form.php
+++ b/wp-admin/edit-tag-form.php
@@ -95,10 +95,11 @@ do_action( "{$taxonomy}_term_edit_form_tag" );
 			 *
 			 * @since 2.6.0
 			 *
-			 * @param string $slug The current term slug.
+			 * @param string $tag_slug The current term slug.
 			 */
+			$slug = isset( $tag->slug ) ? apply_filters( 'editable_slug', $tag->slug ) : '';
 			?>
-			<td><input name="slug" id="slug" type="text" value="<?php if ( isset( $tag->slug ) ) echo esc_attr( apply_filters( 'editable_slug', $tag->slug ) ); ?>" size="40" />
+			<td><input name="slug" id="slug" type="text" value="<?php echo esc_attr( $slug ); ?>" size="40" />
 			<p class="description"><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p></td>
 		</tr>
 <?php } ?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 485a16ddf2..d77777d50f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31686';
+$wp_version = '4.2-alpha-31687';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.