Index: wp-admin/custom-header.php
===================================================================
--- wp-admin/custom-header.php	(revision 21203)
+++ wp-admin/custom-header.php	(working copy)
@@ -742,36 +742,36 @@
 		?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php _e( 'Crop Header Image' ); ?></h2>
-
-<form method="post" action="<?php echo esc_attr(add_query_arg('step', 3)); ?>">
-	<p class="hide-if-no-js"><?php _e('Choose the part of the image you want to use as your header.'); ?></p>
-	<p class="hide-if-js"><strong><?php _e( 'You need Javascript to choose a part of the image.'); ?></strong></p>
-
-	<div id="crop_image" style="position: relative">
-		<img src="<?php echo esc_url( $url ); ?>" id="upload" width="<?php echo $width; ?>" height="<?php echo $height; ?>" />
-	</div>
-
-	<input type="hidden" name="x1" id="x1" value="0"/>
-	<input type="hidden" name="y1" id="y1" value="0"/>
-	<input type="hidden" name="width" id="width" value="<?php echo esc_attr( $width ); ?>"/>
-	<input type="hidden" name="height" id="height" value="<?php echo esc_attr( $height ); ?>"/>
-	<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr( $attachment_id ); ?>" />
-	<input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr( $oitar ); ?>" />
-	<?php if ( empty( $_POST ) && isset( $_GET['file'] ) ) { ?>
-	<input type="hidden" name="create-new-attachment" value="true" />
-	<?php } ?>
-	<?php wp_nonce_field( 'custom-header-crop-image' ) ?>
-
-	<p class="submit">
-	<?php submit_button( __( 'Crop and Publish' ), 'primary', 'submit', false ); ?>
-	<?php
-	if ( isset( $oitar ) && 1 == $oitar )
-		submit_button( __( 'Skip Cropping, Publish Image as Is' ), 'secondary', 'skip-cropping', false );
-	?>
-	</p>
-</form>
+	<?php screen_icon(); ?>
+	<h2><?php _e( 'Crop Header Image' ); ?></h2>
+	
+	<form method="post" action="<?php echo esc_attr(add_query_arg('step', 3)); ?>">
+		<p class="hide-if-no-js"><?php _e('Choose the part of the image you want to use as your header.'); ?></p>
+		<p class="hide-if-js"><strong><?php _e( 'You need Javascript to choose a part of the image.'); ?></strong></p>
+	
+		<div id="crop_image" style="position: relative">
+			<img src="<?php echo esc_url( $url ); ?>" id="upload" width="<?php echo $width; ?>" height="<?php echo $height; ?>" />
+		</div>
+	
+		<input type="hidden" name="x1" id="x1" value="0"/>
+		<input type="hidden" name="y1" id="y1" value="0"/>
+		<input type="hidden" name="width" id="width" value="<?php echo esc_attr( $width ); ?>"/>
+		<input type="hidden" name="height" id="height" value="<?php echo esc_attr( $height ); ?>"/>
+		<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr( $attachment_id ); ?>" />
+		<input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr( $oitar ); ?>" />
+		<?php if ( empty( $_POST ) && isset( $_GET['file'] ) ) { ?>
+		<input type="hidden" name="create-new-attachment" value="true" />
+		<?php } ?>
+		<?php wp_nonce_field( 'custom-header-crop-image' ) ?>
+	
+		<p class="submit">
+		<?php submit_button( __( 'Crop and Publish' ), 'primary', 'submit', false ); ?>
+		<?php
+		if ( isset( $oitar ) && 1 == $oitar && ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) )
+			submit_button( __( 'Skip Cropping, Publish Image as Is' ), 'secondary', 'skip-cropping', false );
+		?>
+		</p>
+	</form>
 </div>
 		<?php
 	}