From 5ab785b054b5a272d9872eef172f1c83eff96456 Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Sat, 4 Jul 2015 04:01:26 +0000
Subject: [PATCH] Only output Save Changes in My Sites when a user is a member
 of more than one site.

The conditional also checks for the existence of filters that may otherwise alter the HTML in My Sites to include extra form inputs for these users. If a filter is in use, the Save Changes button will display.

Props @Oxymoron, @obenland.
Fixes #32645.

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


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

diff --git a/wp-admin/my-sites.php b/wp-admin/my-sites.php
index fbdd2cece4..13539c4087 100644
--- a/wp-admin/my-sites.php
+++ b/wp-admin/my-sites.php
@@ -113,9 +113,13 @@ else :
 		echo "</li>";
 	}?>
 	</ul>
-	<input type="hidden" name="action" value="updateblogsettings" />
-	<?php wp_nonce_field( 'update-my-sites' ); ?>
-	<?php submit_button(); ?>
+	<?php
+	if ( count( $blogs ) > 1 || has_action( 'myblogs_allblogs_options' ) || has_filter( 'myblogs_options' ) ) {
+		?><input type="hidden" name="action" value="updateblogsettings" /><?php
+		wp_nonce_field( 'update-my-sites' );
+		submit_button();
+	}
+	?>
 	</form>
 <?php endif; ?>
 	</div>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index bd36db9470..31272dfdb9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-beta1-33079';
+$wp_version = '4.3-beta1-33080';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.