From 231c73751b213477306671be103a8f81d6640a0c Mon Sep 17 00:00:00 2001
From: Gary Pendergast <pento@git.wordpress.org>
Date: Fri, 8 May 2015 06:51:52 +0000
Subject: [PATCH] On the Writing Options screen, hide the Balance Tags and
 Convert Smilies options on new installs.

Fixes #5161.
Fixes #32298.



git-svn-id: https://develop.svn.wordpress.org/trunk@32454 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/options-writing.php | 2 ++
 src/wp-includes/version.php      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/wp-admin/options-writing.php b/src/wp-admin/options-writing.php
index 5e62f54824..0e14ff32dc 100644
--- a/src/wp-admin/options-writing.php
+++ b/src/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/src/wp-includes/version.php b/src/wp-includes/version.php
index fc76e98885..ea523a6acf 100644
--- a/src/wp-includes/version.php
+++ b/src/wp-includes/version.php
@@ -11,7 +11,7 @@ $wp_version = '4.3-alpha-32280-src';
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 32378;
+$wp_db_version = 32453;
 
 /**
  * Holds the TinyMCE version