sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

In Custom_Image_Header:

Browse Source 
* 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.


git-svn-id: https://develop.svn.wordpress.org/trunk@31134 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
wonderboymusic 2015-01-10 22:10:02 +00:00
parent b23a9d9dff
commit cdb5c75ab2
1 changed files with 3 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/wp-admin/custom-header.php
View File

@ -20,18 +20,16 @@ class Custom_Image_Header {
*
* @var callback
* @since 2.1.0
* @access private
*/
private $admin_header_callback;
public $admin_header_callback;
/**
* Callback for header div.
*
* @var callback
* @since 3.0.0
* @access private
*/
private $admin_image_div_callback;
public $admin_image_div_callback;
/**
* Holds default headers.
@ -40,25 +38,7 @@ class Custom_Image_Header {
* @since 3.0.0
* @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();
/**
* @var bool
@ -84,58 +64,6 @@ class Custom_Image_Header {
add_action( 'wp_ajax_custom-header-remove', array( $this, 'ajax_header_remove' ) );
}
/**
* 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,8 +75,6 @@ class Custom_Image_Header {
return;
}
$this->page = $page;
add_action( "admin_print_scripts-$page", array( $this, 'js_includes' ) );
add_action( "admin_print_styles-$page", array( $this, 'css_includes' ) );
add_action( "admin_head-$page", array( $this, 'help' ) );