Changeset 26878 for trunk/src/wp-admin/custom-background.php

Timestamp:

12/29/2013 08:05:50 AM (11 years ago)

Author:

SergeyBiryukov

Message:

Always show Background Image section heading and the opening table tag on Custom Background screen, to make in consistent with Custom Header and avoid broken markup.

props obenland.
fixes #26731.

File:

• trunk/src/wp-admin/custom-background.php (modified) (2 diffs)

trunk/src/wp-admin/custom-background.php

@@ -180 +180 @@
 ?>
 <div class="wrap" id="custom-background">
-<h2><?php _e('Custom Background'); ?></h2>
-<?php if ( !empty($this->updated) ) { ?>
+<h2><?php _e( 'Custom Background' ); ?></h2>
+
+<?php if ( ! empty( $this->updated ) ) { ?>
 <div id="message" class="updated">
 <p><?php printf( __( 'Background updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) ); ?></p>
 </div>
-<?php }
-
-    if ( $this->admin_image_div_callback ) {
-        call_user_func($this->admin_image_div_callback);
-    } else {
-?>
-<h3><?php _e('Background Image'); ?></h3>
+<?php } ?>
+
+<h3><?php _e( 'Background Image' ); ?></h3>
+
 <table class="form-table">
 <tbody>
 <tr valign="top">
-<th scope="row"><?php _e('Preview'); ?></th>
+<th scope="row"><?php _e( 'Preview' ); ?></th>
 <td>
-<?php
-$background_styles = '';
-if ( $bgcolor = get_background_color() )
-    $background_styles .= 'background-color: #' . $bgcolor . ';';
-
-if ( get_background_image() ) {
-    $background_image_thumb = esc_url( set_url_scheme( get_theme_mod( 'background_image_thumb', str_replace( '%', '%%', get_background_image() ) ) ) );
-    // background-image URL must be single quote, see below
-    $background_styles .= ' background-image: url(\'' . $background_image_thumb . '\');'
-        . ' background-repeat: ' . get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) ) . ';'
-        . ' background-position: top ' . get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
-}
-?>
-<div id="custom-background-image" style="<?php echo $background_styles; ?>"><?php // must be double quote, see above ?>
-<?php if ( get_background_image() ) { ?>
-<img class="custom-background-image" src="<?php echo $background_image_thumb; ?>" style="visibility:hidden;" alt="" /><br />
-<img class="custom-background-image" src="<?php echo $background_image_thumb; ?>" style="visibility:hidden;" alt="" />
-<?php } ?>
-</div>
-<?php } ?>
+    <?php
+    if ( $this->admin_image_div_callback ) {
+        call_user_func( $this->admin_image_div_callback );
+    } else {
+        $background_styles = '';
+        if ( $bgcolor = get_background_color() )
+            $background_styles .= 'background-color: #' . $bgcolor . ';';
+
+        if ( get_background_image() ) {
+            $background_image_thumb = esc_url( set_url_scheme( get_theme_mod( 'background_image_thumb', str_replace( '%', '%%', get_background_image() ) ) ) );
+            // background-image URL must be single quote, see below
+            $background_styles .= ' background-image: url(\'' . $background_image_thumb . '\');'
+                . ' background-repeat: ' . get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) ) . ';'
+                . ' background-position: top ' . get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
+        }
+    ?>
+    <div id="custom-background-image" style="<?php echo $background_styles; ?>"><?php // must be double quote, see above ?>
+        <?php if ( get_background_image() ) { ?>
+        <img class="custom-background-image" src="<?php echo $background_image_thumb; ?>" style="visibility:hidden;" alt="" /><br />
+        <img class="custom-background-image" src="<?php echo $background_image_thumb; ?>" style="visibility:hidden;" alt="" />
+        <?php } ?>
+    </div>
+    <?php } ?>
 </td>
 </tr>
+
 <?php if ( get_background_image() ) : ?>
 <tr valign="top">
@@ -244 +246 @@
 </td>
 </tr>
-
 <?php endif; ?>
+
 <tr valign="top">
 <th scope="row"><?php _e('Select Image'); ?></th>