From 412e070d6997215ecd6f4f03b48515410441a9ad Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Fri, 8 May 2015 06:52:27 +0000
Subject: [PATCH] On the Writing Options screen, hide the Balance Tags and
 Convert Smilies options on new installs.

Fixes #5161.
Fixes #32298.


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


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

diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index 5e62f54824..0e14ff32dc 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -56,6 +56,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 <?php settings_fields('writing'); ?>
 
 <table class="form-table">
+<?php if ( get_site_option( 'initial_db_version' ) < 32453 ) : ?>
 <tr>
 <th scope="row"><?php _e('Formatting') ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Formatting') ?></span></legend>
@@ -65,6 +66,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 <label for="use_balanceTags"><input name="use_balanceTags" type="checkbox" id="use_balanceTags" value="1" <?php checked('1', get_option('use_balanceTags')); ?> /> <?php _e('WordPress should correct invalidly nested XHTML automatically') ?></label>
 </fieldset></td>
 </tr>
+<?php endif; ?>
 <tr>
 <th scope="row"><label for="default_category"><?php _e('Default Post Category') ?></label></th>
 <td>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d3dcc7762b..16f6865496 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,14 +4,14 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-alpha-32453';
+$wp_version = '4.3-alpha-32454';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 32378;
+$wp_db_version = 32453;
 
 /**
  * Holds the TinyMCE version