Changeset 13307

Timestamp:

02/22/2010 08:15:06 PM (17 years ago)

Author:

ryan

Message:

Grammar fix. Don't show empty img. Cleanup POST handler. see #12186

File:

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

trunk/wp-admin/custom-background.php

@@ -90 +90 @@
                         return;
 
-                if ( isset($_POST['reset-background']) ) {
-                        check_admin_referer('custom-background');
+                if ( empty($_POST) )
+                        return;
+
+                check_admin_referer('custom-background');
+
+                if ( isset($_POST['reset-background']) )
                         remove_theme_mods();
-                }
                 if ( isset($_POST['background-repeat']) ) {
-                        check_admin_referer('custom-background');
                         if ( in_array($_POST['background-repeat'], array('repeat', 'no-repeat')) )
                                 $repeat = $_POST['background-repeat'];
@@ -103 +105 @@
                 }
                 if ( isset($_POST['background-position']) ) {
-                        check_admin_referer('custom-background');
                         if ( in_array($_POST['background-position'], array('center', 'right', 'left')) )
                                 $position = $_POST['background-position'];
@@ -111 +112 @@
                 }
                 if ( isset($_POST['background-attachment']) ) {
-                        check_admin_referer('custom-background');
                         if ( in_array($_POST['background-attachment'], array('fixed', 'scroll')) )
                                 $attachment = $_POST['background-attachment'];
@@ -118 +118 @@
                         set_theme_mod('background_attachment', $attachment);
                 }
-                if ( isset($_POST['remove-background']) ) {
-                        check_admin_referer('custom-background');
+                if ( isset($_POST['remove-background']) )
                         set_theme_mod('background_image', '');
-                }
         }
 
@@ -142 +140 @@
 <p><?php _e('This is your current background image.'); ?></p>
 <?php
-} else { ?>
-<p><?php _e('There is currently no background image.'); ?></p> <?php
-}
-
-if ( $this->admin_image_div_callback ) {
-  call_user_func($this->admin_image_div_callback);
-} else {
+        if ( $this->admin_image_div_callback ) {
+                call_user_func($this->admin_image_div_callback);
+        } else {
 ?>
 <div id="custom-background-image">
 <img class="custom-background-image" src="<?php background_image(); ?>" />
 </div>
-<?php } ?>
-
-<?php if ( get_background_image() ) : ?>
+<?php }
+} else { ?>
+<p><?php _e('There is currently no background image.'); ?></p> <?php
+}
+
+if ( get_background_image() ) : ?>
         
 <h2><?php _e('Change Display Options') ?></h2>
@@ -227 +224 @@
 <?php if ( get_background_image() ) : ?>
 <h2><?php _e('Remove Background Image'); ?></h2>
-<p><?php _e('This will remove background image. You will not be able to retrieve any customizations.') ?></p>
+<p><?php _e('This will remove the background image. You will not be able to retrieve any customizations.') ?></p>
 <form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)) ?>">
 <?php wp_nonce_field('custom-background'); ?>