Index: wp-admin/custom-background.php =================================================================== --- wp-admin/custom-background.php (revision 14572) +++ wp-admin/custom-background.php (working copy) @@ -41,7 +41,7 @@ * @param callback $admin_image_div_callback Optional custom image div output callback. * @return Custom_Background */ - function Custom_Background($admin_header_callback = '', $admin_image_div_callback = '') { + function Custom_Background( $admin_header_callback = '', $admin_image_div_callback = '' ) { $this->admin_header_callback = $admin_header_callback; $this->admin_image_div_callback = $admin_image_div_callback; } @@ -52,17 +52,17 @@ * @since 3.0.0 */ function init() { - if ( ! current_user_can('switch_themes') ) + if ( ! current_user_can( 'edit_theme_options' ) ) return; - $page = add_theme_page(__('Background'), __('Background'), 'switch_themes', 'custom-background', array(&$this, 'admin_page')); + $page = add_theme_page( __( 'Background' ), __( 'Background' ), 'edit_theme_options', 'custom-background', array( &$this, 'admin_page' ) ); - add_action("load-$page", array(&$this, 'admin_load')); - add_action("load-$page", array(&$this, 'take_action'), 49); - add_action("load-$page", array(&$this, 'handle_upload'), 49); + add_action( "load-$page", array( &$this, 'admin_load' ) ); + add_action( "load-$page", array( &$this, 'take_action' ), 49 ); + add_action( "load-$page", array( &$this, 'handle_upload' ), 49 ); if ( $this->admin_header_callback ) - add_action("admin_head-$page", $this->admin_header_callback, 51); + add_action( "admin_head-$page", $this->admin_header_callback, 51 ); } /** @@ -71,8 +71,8 @@ * @since 3.0.0 */ function admin_load() { - wp_enqueue_script('custom-background'); - wp_enqueue_style('farbtastic'); + wp_enqueue_script( 'custom-background' ); + wp_enqueue_style( 'farbtastic' ); } /** @@ -82,47 +82,47 @@ */ function take_action() { - if ( empty($_POST) ) + if ( empty( $_POST ) ) return; - check_admin_referer('custom-background'); + check_admin_referer( 'custom-background' ); - if ( isset($_POST['reset-background']) ) { - remove_theme_mods(); + if ( isset( $_POST['reset-background'] ) ) { + remove_theme_mod( 'background_image' ); return; } - if ( isset($_POST['remove-background']) ) { + if ( isset( $_POST['remove-background'] ) ) { // @TODO: Uploaded files are not removed here. - set_theme_mod('background_image', ''); + set_theme_mod( 'background_image', '' ); } - if ( isset($_POST['background-repeat']) ) { - if ( in_array($_POST['background-repeat'], array('repeat', 'no-repeat', 'repeat-x', 'repeat-y')) ) + if ( isset( $_POST['background-repeat'] ) ) { + if ( in_array( $_POST['background-repeat'], array( 'repeat', 'no-repeat', 'repeat-x', 'repeat-y' ) ) ) $repeat = $_POST['background-repeat']; else $repeat = 'repeat'; - set_theme_mod('background_repeat', $repeat); + set_theme_mod( 'background_repeat', $repeat ); } - if ( isset($_POST['background-position']) ) { - if ( in_array($_POST['background-position'], array('center', 'right', 'left')) ) + if ( isset( $_POST['background-position'] ) ) { + if ( in_array( $_POST['background-position'], array( 'center', 'right', 'left' ) ) ) $position = $_POST['background-position']; else $position = 'left'; - set_theme_mod('background_position', $position); + set_theme_mod( 'background_position', $position ); } - if ( isset($_POST['background-attachment']) ) { - if ( in_array($_POST['background-attachment'], array('fixed', 'scroll')) ) + if ( isset( $_POST['background-attachment'] ) ) { + if ( in_array( $_POST['background-attachment'], array( 'fixed', 'scroll' ) ) ) $attachment = $_POST['background-attachment']; else $attachment = 'fixed'; - set_theme_mod('background_attachment', $attachment); + set_theme_mod( 'background_attachment', $attachment ); } - if ( isset($_POST['background-color']) ) { - $color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['background-color']); - if ( strlen($color) == 6 || strlen($color) == 3 ) - set_theme_mod('background_color', $color); + if ( isset( $_POST['background-color'] ) ) { + $color = preg_replace( '/[^0-9a-fA-F]/', '', $_POST['background-color'] ); + if ( strlen( $color ) == 6 || strlen( $color ) == 3 ) + set_theme_mod( 'background_color', $color ); else - set_theme_mod('background_color', ''); + set_theme_mod( 'background_color', '' ); } $this->updated = true; @@ -137,147 +137,165 @@ ?>
-

-updated) ) { ?> +

+updated ) ) { ?>
-

Visit your site to see how it looks.' ), home_url( '/' ) ); ?>

+

Visit your site to see how it looks.' ), home_url( '/' ) ); ?>

admin_image_div_callback ) { - call_user_func($this->admin_image_div_callback); + call_user_func( $this->admin_image_div_callback ); } else { ?> -

+

- - - - - - - - - - + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + +
- -
- -
- - -
-
- -

-
- - -
-
+ +
+ +
+ + +
+
+ +

-
- - -
-
-
- - -

- -

-
-
+

+
+ + +
+
+

+
+ + +
+
+
+

+
+ + + + +

+
+
-

+

- - - + + - + + + + - - - - + + + + - - - - + + + + - - - - - + + + +
- - +
+
+ + + - -
- - - -
+
+ + + + +
+
- -
+
+ + +
+
- - -
+
+ + + +
+
- -

+ +

+ +

@@ -291,41 +309,41 @@ */ function handle_upload() { - if ( empty($_FILES) ) + if ( empty( $_FILES ) ) return; - check_admin_referer('custom-background'); - $overrides = array('test_form' => false); - $file = wp_handle_upload($_FILES['import'], $overrides); + check_admin_referer( 'custom-background' ); + $overrides = array( 'test_form' => false ); + $file = wp_handle_upload( $_FILES['import'], $overrides ); - if ( isset($file['error']) ) - wp_die( $file['error'] ); + if ( isset( $file['error'] ) ) + wp_die( $file['error'], __( 'Image Upload Error' ) ); $url = $file['url']; $type = $file['type']; $file = $file['file']; - $filename = basename($file); + $filename = basename( $file ); // Construct the object array $object = array( 'post_title' => $filename, - 'post_content' => $url, + 'post_content' => __( 'This is your background image, if you delete it, you will lost your background image.' ), 'post_mime_type' => $type, 'guid' => $url ); // Save the data - $id = wp_insert_attachment($object, $file); + $id = wp_insert_attachment( $object, $file ); // Add the meta-data wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) ); - set_theme_mod('background_image', esc_url($url)); + set_theme_mod( 'background_image', esc_url( $url ) ); $thumbnail = wp_get_attachment_image_src( $id, 'thumbnail' ); - set_theme_mod('background_image_thumb', esc_url( $thumbnail[0] ) ); + set_theme_mod( 'background_image_thumb', esc_url( $thumbnail[0] ) ); - do_action('wp_create_file_in_uploads', $file, $id); // For replication + do_action( 'wp_create_file_in_uploads', $file, $id ); // For replication $this->updated = true; }