From f3107e584290457d02eb3e6ceb41c3c9d390a37e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Helen=20Hou-Sand=C3=AD?= <helen.y.hou@gmail.com>
Date: Thu, 15 Oct 2015 03:08:24 +0000
Subject: [PATCH] Make some primary action buttons look primary.

* User deletion/removal
* Site status change (multisite)
* Network upgrade
* Import file upload
* Media browser upload

props Dezzy for the initial patch.
fixes #23738.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35148 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/media.php              | 2 +-
 wp-admin/includes/ms.php                 | 2 +-
 wp-admin/includes/template-functions.php | 2 +-
 wp-admin/network/sites.php               | 2 +-
 wp-admin/network/upgrade.php             | 2 +-
 wp-admin/users.php                       | 4 ++--
 wp-includes/version.php                  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 66f71ceb2f..50f27d23ea 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -1927,7 +1927,7 @@ do_action( 'post-plupload-upload-ui' ); ?>
 	<p id="async-upload-wrap">
 		<label class="screen-reader-text" for="async-upload"><?php _e('Upload'); ?></label>
 		<input type="file" name="async-upload" id="async-upload" />
-		<?php submit_button( __( 'Upload' ), 'button', 'html-upload', false ); ?>
+		<?php submit_button( __( 'Upload' ), 'primary', 'html-upload', false ); ?>
 		<a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e('Cancel'); ?></a>
 	</p>
 	<div class="clear"></div>
diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php
index 075d48fb28..432a9f0893 100644
--- a/wp-admin/includes/ms.php
+++ b/wp-admin/includes/ms.php
@@ -1077,7 +1077,7 @@ function confirm_delete_users( $users ) {
 		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, these users will be permanently removed.' ); ?></p>
 	<?php endif;
 
-	submit_button( __('Confirm Deletion'), 'delete' );
+	submit_button( __('Confirm Deletion'), 'primary' );
 	?>
 	</form>
 	<?php
diff --git a/wp-admin/includes/template-functions.php b/wp-admin/includes/template-functions.php
index 758cbfc0b3..c53a55dc37 100644
--- a/wp-admin/includes/template-functions.php
+++ b/wp-admin/includes/template-functions.php
@@ -845,7 +845,7 @@ function wp_import_upload_form( $action ) {
 <input type="hidden" name="action" value="save" />
 <input type="hidden" name="max_file_size" value="<?php echo $bytes; ?>" />
 </p>
-<?php submit_button( __('Upload file and import'), 'button' ); ?>
+<?php submit_button( __('Upload file and import'), 'primary' ); ?>
 </form>
 <?php
 	endif;
diff --git a/wp-admin/network/sites.php b/wp-admin/network/sites.php
index c7013c0190..e0e7e1e995 100644
--- a/wp-admin/network/sites.php
+++ b/wp-admin/network/sites.php
@@ -107,7 +107,7 @@ if ( isset( $_GET['action'] ) ) {
 					<input type="hidden" name="_wp_http_referer" value="<?php echo esc_attr( wp_get_referer() ); ?>" />
 					<?php wp_nonce_field( $site_action . '_' . $id, '_wpnonce', false ); ?>
 					<p><?php echo sprintf( $manage_actions[ $site_action ], $site_address ); ?></p>
-					<?php submit_button( __( 'Confirm' ), 'button' ); ?>
+					<?php submit_button( __( 'Confirm' ), 'primary' ); ?>
 				</form>
 			</div>
 		<?php
diff --git a/wp-admin/network/upgrade.php b/wp-admin/network/upgrade.php
index 11e9a41b7a..c885a84889 100644
--- a/wp-admin/network/upgrade.php
+++ b/wp-admin/network/upgrade.php
@@ -116,7 +116,7 @@ switch ( $action ) {
 		<?php endif; ?>
 
 		<p><?php _e( 'The database update process may take a little while, so please be patient.' ); ?></p>
-		<p><a class="button" href="upgrade.php?action=upgrade"><?php _e( 'Upgrade Network' ); ?></a></p>
+		<p><a class="button button-primary" href="upgrade.php?action=upgrade"><?php _e( 'Upgrade Network' ); ?></a></p>
 		<?php
 		/**
 		 * Fires before the footer on the network upgrade screen.
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 7101224ee8..a541baf639 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -282,7 +282,7 @@ case 'delete':
 	do_action( 'delete_user_form', $current_user );
 	?>
 	<input type="hidden" name="action" value="dodelete" />
-	<?php submit_button( __('Confirm Deletion'), 'secondary' ); ?>
+	<?php submit_button( __('Confirm Deletion'), 'primary' ); ?>
 <?php else : ?>
 	<p><?php _e('There are no valid users selected for deletion.'); ?></p>
 <?php endif; ?>
@@ -380,7 +380,7 @@ case 'remove':
 </ul>
 <?php if ( $go_remove ) : ?>
 		<input type="hidden" name="action" value="doremove" />
-		<?php submit_button( __('Confirm Removal'), 'secondary' ); ?>
+		<?php submit_button( __('Confirm Removal'), 'primary' ); ?>
 <?php else : ?>
 	<p><?php _e('There are no valid users selected for removal.'); ?></p>
 <?php endif; ?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b352c40007..7e4a2ba73a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-35181';
+$wp_version = '4.4-alpha-35182';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.