Changeset 31134

Timestamp:

01/10/2015 10:10:02 PM (9 years ago)

Author:

wonderboymusic

Message:

In Custom_Image_Header:

• In [28481], $admin_header_callback and $admin_image_div_callback were set to private based on their erroneous @param values
• $admin_header_callback and $admin_image_div_callback are used as hook callbacks - as such, they must be public
• In [28521] and [28524], magic methods were added for back-compat
• Currently, there are 4 properties marked private: $uploaded_headers, $default_headers, $page, and $updated - $page and $uploaded_headers are never used and $updated was added by me in [30187] during 4.1. $default_headers does not necessarily need to be private

Set $admin_header_callback and $admin_image_div_callback to public.
Remove the $page property - it duplicated the $page local var and is referenced/used nowhere.
Remove the $uploaded_headers property - it is used nowhere and is dead code.
Set $default_headers to public.
Remove the magic methods - they were beyond overkill and rendered moot by the above changes.

See #30891.

File:

• trunk/src/wp-admin/custom-header.php (modified) (5 diffs)

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

@@ -21 +21 @@
      * @var callback
      * @since 2.1.0
-     * @access private
-     */
-    private $admin_header_callback;
+     */
+    public $admin_header_callback;
 
     /**
@@ -30 +29 @@
      * @var callback
      * @since 3.0.0
-     * @access private
-     */
-    private $admin_image_div_callback;
+     */
+    public $admin_image_div_callback;
 
     /**
@@ -41 +39 @@
      * @access private
      */
-    private $default_headers = array();
-
-    /**
-     * Holds custom headers uploaded by the user.
-     *
-     * @var array
-     * @since 3.2.0
-     * @access private
-     */
-    private $uploaded_headers = array();
-
-    /**
-     * Holds the page menu hook.
-     *
-     * @var string
-     * @since 3.0.0
-     * @access private
-     */
-    private $page = '';
+    public $default_headers = array();
 
     /**
@@ -86 +66 @@
 
     /**
-     * Make private properties readable for backwards compatibility.
-     *
-     * @since 4.0.0
-     * @access public
-     *
-     * @param string $name Property to get.
-     * @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 Header admin page.
      *
@@ -147 +75 @@
             return;
         }
-
-        $this->page = $page;
 
         add_action( "admin_print_scripts-$page", array( $this, 'js_includes' ) );