WordPress 4.4

[autoinstalls/wordpress.git] / wp-admin / custom-background.php

diff --git a/wp-admin/custom-background.php b/wp-admin/custom-background.php
index 8fb1901c254ff8272b84007deb5d2c7a669d3071..dba32c661e5d7d3b7bf84ee45d0af4819baf0557 100644 (file)
--- a/wp-admin/custom-background.php
+++ b/wp-admin/custom-background.php
@@ -18,31 +18,24 @@ class Custom_Background {
        /**
         * Callback for administration header.
         *
        /**
         * Callback for administration header.
         *

-        * @var callback
+        * @var callable

         * @since 3.0.0
         * @since 3.0.0

-        * @access private

         */
         */

-       private $admin_header_callback;
+       public $admin_header_callback;

 
        /**
         * Callback for header div.
         *
 
        /**
         * Callback for header div.
         *

-        * @var callback
+        * @var callable

         * @since 3.0.0
         * @since 3.0.0

-        * @access private

         */
         */

-       private $admin_image_div_callback;
+       public $admin_image_div_callback;

 
        /**
 
        /**

-        * Holds the page menu hook.
+        * Used to trigger a success message when settings updated and set to true.

         *
         *

-        * @var string

         * @since 3.0.0
         * @access private
         * @since 3.0.0
         * @access private

-        */
-       private $page = '';
-
-       /**

         * @var bool
         */
        private $updated;
         * @var bool
         */
        private $updated;


@@ -51,9 +44,8 @@ class Custom_Background {
         * Constructor - Register administration header callback.
         *
         * @since 3.0.0
         * Constructor - Register administration header callback.
         *
         * @since 3.0.0

-        * @param callback $admin_header_callback
-        * @param callback $admin_image_div_callback Optional custom image div output callback.
-        * @return Custom_Background
+        * @param callable $admin_header_callback
+        * @param callable $admin_image_div_callback Optional custom image div output callback.

         */
        public function __construct($admin_header_callback = '', $admin_image_div_callback = '') {
                $this->admin_header_callback = $admin_header_callback;
         */
        public function __construct($admin_header_callback = '', $admin_image_div_callback = '') {
                $this->admin_header_callback = $admin_header_callback;


@@ -67,75 +59,24 @@ class Custom_Background {
                add_action( 'wp_ajax_set-background-image', array( $this, 'wp_set_background_image' ) );
        }
 
                add_action( 'wp_ajax_set-background-image', array( $this, 'wp_set_background_image' ) );
        }
 

-       /**
-        * Make private properties readable for backwards compatibility.
-        *
-        * @since 4.0.0
-        * @access public
-        *
-        * @param string $name Property name.
-        * @return mixed Property.
-        */
-       public function __get( $name ) {
-               return $this->$name;
-       }
-
-       /**
-        * Make private properties settable for backwards compatibility.
-        *
-        * @since 4.0.0
-        * @access public
-        *
-        * @param string $name  Property to set.
-        * @param mixed  $value Property value.
-        * @return mixed Newly-set property.
-        */
-       public function __set( $name, $value ) {
-               return $this->$name = $value;
-       }
-
-       /**
-        * Make private properties checkable for backwards compatibility.
-        *
-        * @since 4.0.0
-        * @access public
-        *
-        * @param string $name Property to check if set.
-        * @return bool Whether the property is set.
-        */
-       public function __isset( $name ) {
-               return isset( $this->$name );
-       }
-
-       /**
-        * Make private properties un-settable for backwards compatibility.
-        *
-        * @since 4.0.0
-        * @access public
-        *
-        * @param string $name Property to unset.
-        */
-       public function __unset( $name ) {
-               unset( $this->$name );
-       }
-

        /**
         * Set up the hooks for the Custom Background admin page.
         *
         * @since 3.0.0
         */
        public function init() {
        /**
         * Set up the hooks for the Custom Background admin page.
         *
         * @since 3.0.0
         */
        public function init() {

-               if ( ! current_user_can('edit_theme_options') )
+               $page = add_theme_page( __( 'Background' ), __( 'Background' ), 'edit_theme_options', 'custom-background', array( $this, 'admin_page' ) );
+               if ( ! $page ) {

                        return;
                        return;

+               }

 
 

-               $this->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);
+               if ( $this->admin_header_callback ) {
+                       add_action( "admin_head-$page", $this->admin_header_callback, 51 );
+               }

        }
 
        /**
        }
 
        /**


@@ -156,7 +97,7 @@ class Custom_Background {
 
                get_current_screen()->set_help_sidebar(
                        '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
 
                get_current_screen()->set_help_sidebar(
                        '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .

-                       '<p>' . __( '<a href="http://codex.wordpress.org/Appearance_Background_Screen" target="_blank">Documentation on Custom Background</a>' ) . '</p>' .
+                       '<p>' . __( '<a href="https://codex.wordpress.org/Appearance_Background_Screen" target="_blank">Documentation on Custom Background</a>' ) . '</p>' .

                        '<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
                );
 
                        '<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
                );
 


@@ -171,7 +112,6 @@ class Custom_Background {
         * @since 3.0.0
         */
        public function take_action() {
         * @since 3.0.0
         */
        public function take_action() {

-

                if ( empty($_POST) )
                        return;
 
                if ( empty($_POST) )
                        return;
 


@@ -240,7 +180,7 @@ class Custom_Background {
        public function admin_page() {
 ?>
 <div class="wrap" id="custom-background">
        public function admin_page() {
 ?>
 <div class="wrap" id="custom-background">

-<h2><?php _e( 'Custom Background' ); ?></h2>
+<h1><?php _e( 'Custom Background' ); ?></h1>

 
 <?php if ( current_user_can( 'customize' ) ) { ?>
 <div class="notice notice-info hide-if-no-customize">
 
 <?php if ( current_user_can( 'customize' ) ) { ?>
 <div class="notice notice-info hide-if-no-customize">


@@ -276,8 +216,9 @@ class Custom_Background {
                if ( $bgcolor = get_background_color() )
                        $background_styles .= 'background-color: #' . $bgcolor . ';';
 
                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_thumb = get_background_image();
+               if ( $background_image_thumb ) {
+                       $background_image_thumb = esc_url( set_url_scheme( get_theme_mod( 'background_image_thumb', str_replace( '%', '%%', $background_image_thumb ) ) ) );

 
                        // Background-image URL must be single quote, see below.
                        $background_styles .= ' background-image: url(\'' . $background_image_thumb . '\');'
 
                        // Background-image URL must be single quote, see below.
                        $background_styles .= ' background-image: url(\'' . $background_image_thumb . '\');'


@@ -286,7 +227,7 @@ class Custom_Background {
                }
        ?>
        <div id="custom-background-image" style="<?php echo $background_styles; ?>"><?php // must be double quote, see above ?>
                }
        ?>
        <div id="custom-background-image" style="<?php echo $background_styles; ?>"><?php // must be double quote, see above ?>

-               <?php if ( get_background_image() ) { ?>
+               <?php if ( $background_image_thumb ) { ?>

                <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 } ?>
                <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 } ?>


@@ -299,7 +240,7 @@ class Custom_Background {
 <tr>
 <th scope="row"><?php _e('Remove Image'); ?></th>
 <td>
 <tr>
 <th scope="row"><?php _e('Remove Image'); ?></th>
 <td>

-<form method="post" action="">
+<form method="post">

 <?php wp_nonce_field('custom-background-remove', '_wpnonce-custom-background-remove'); ?>
 <?php submit_button( __( 'Remove Background Image' ), 'button', 'remove-background', false ); ?><br/>
 <?php _e('This will remove the background image. You will not be able to restore any customizations.') ?>
 <?php wp_nonce_field('custom-background-remove', '_wpnonce-custom-background-remove'); ?>
 <?php submit_button( __( 'Remove Background Image' ), 'button', 'remove-background', false ); ?><br/>
 <?php _e('This will remove the background image. You will not be able to restore any customizations.') ?>


@@ -313,7 +254,7 @@ class Custom_Background {
 <tr>
 <th scope="row"><?php _e('Restore Original Image'); ?></th>
 <td>
 <tr>
 <th scope="row"><?php _e('Restore Original Image'); ?></th>
 <td>

-<form method="post" action="">
+<form method="post">

 <?php wp_nonce_field('custom-background-reset', '_wpnonce-custom-background-reset'); ?>
 <?php submit_button( __( 'Restore Original Image' ), 'button', 'reset-background', false ); ?><br/>
 <?php _e('This will restore the original background image. You will not be able to restore any customizations.') ?>
 <?php wp_nonce_field('custom-background-reset', '_wpnonce-custom-background-reset'); ?>
 <?php submit_button( __( 'Restore Original Image' ), 'button', 'reset-background', false ); ?><br/>
 <?php _e('This will restore the original background image. You will not be able to restore any customizations.') ?>


@@ -322,9 +263,10 @@ class Custom_Background {
 </tr>
 <?php endif; ?>
 
 </tr>
 <?php endif; ?>
 

+<?php if ( current_user_can( 'upload_files' ) ): ?>

 <tr>
 <th scope="row"><?php _e('Select Image'); ?></th>
 <tr>
 <th scope="row"><?php _e('Select Image'); ?></th>

-<td><form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post" action="">
+<td><form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post">

        <p>
                <label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br />
                <input type="file" id="upload" name="import" />
        <p>
                <label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br />
                <input type="file" id="upload" name="import" />


@@ -341,11 +283,12 @@ class Custom_Background {
        </form>
 </td>
 </tr>
        </form>
 </td>
 </tr>

+<?php endif; ?>

 </tbody>
 </table>
 
 <h3><?php _e('Display Options') ?></h3>
 </tbody>
 </table>
 
 <h3><?php _e('Display Options') ?></h3>

-<form method="post" action="">
+<form method="post">

 <table class="form-table">
 <tbody>
 <?php if ( get_background_image() ) : ?>
 <table class="form-table">
 <tbody>
 <?php if ( get_background_image() ) : ?>


@@ -419,7 +362,6 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) )
         * @since 3.0.0
         */
        public function handle_upload() {
         * @since 3.0.0
         */
        public function handle_upload() {

-

                if ( empty($_FILES) )
                        return;
 
                if ( empty($_FILES) )
                        return;
 


@@ -427,7 +369,7 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) )
                $overrides = array('test_form' => false);
 
                $uploaded_file = $_FILES['import'];
                $overrides = array('test_form' => false);
 
                $uploaded_file = $_FILES['import'];

-               $wp_filetype = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'], false );
+               $wp_filetype = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'] );

                if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) )
                        wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) );
 
                if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) )
                        wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) );
 


@@ -496,6 +438,9 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) )
         *
         * @since 3.4.0
         * @deprecated 3.5.0
         *
         * @since 3.4.0
         * @deprecated 3.5.0

+        *
+        * @param array $form_fields
+        * @return array $form_fields

         */
        public function attachment_fields_to_edit( $form_fields ) {
                return $form_fields;
         */
        public function attachment_fields_to_edit( $form_fields ) {
                return $form_fields;


@@ -505,6 +450,9 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) )
         *
         * @since 3.4.0
         * @deprecated 3.5.0
         *
         * @since 3.4.0
         * @deprecated 3.5.0

+        *
+        * @param array $tabs
+        * @return array $tabs

         */
        public function filter_upload_tabs( $tabs ) {
                return $tabs;
         */
        public function filter_upload_tabs( $tabs ) {
                return $tabs;