WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade `_WP_List_Table_Compat` to PHP5-style constructor. 

Add `public` to methods/members of `WP_Role`.
Add `public` to methods/members of `WP_User` where appropriate. Don't set `private` where indicated until more study has occurred and tests have been written for compatibiliy with existing magic methods.

See #27881, #22234.

Built from https://develop.svn.wordpress.org/trunk@28531


git-svn-id: http://core.svn.wordpress.org/trunk@28357 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-05-19 17:20:17 +00:00
parent 7415ae10a3
commit 7de0b2b2c8
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/list-table.php
View File

@ -87,7 +87,7 @@ class _WP_List_Table_Compat extends WP_List_Table {
public $_screen; public $_screen;
public $_columns; public $_columns;
public function _WP_List_Table_Compat( $screen, $columns = array() ) { public function __construct( $screen, $columns = array() ) {
if ( is_string( $screen ) ) if ( is_string( $screen ) )
$screen = convert_to_screen( $screen ); $screen = convert_to_screen( $screen );

66
wp-includes/capabilities.php
View File

@ -304,7 +304,7 @@ class WP_Role {
* @access public * @access public
* @var string * @var string
*/ */
var $name; public $name;
/** /**
* List of capabilities the role contains. * List of capabilities the role contains.
@ -313,7 +313,7 @@ class WP_Role {
* @access public * @access public
* @var array * @var array
*/ */
var $capabilities; public $capabilities;
/** /**
* Constructor - Set up object properties. * Constructor - Set up object properties.
@ -327,7 +327,7 @@ class WP_Role {
* @param string $role Role name. * @param string $role Role name.
* @param array $capabilities List of capabilities. * @param array $capabilities List of capabilities.
*/ */
function __construct( $role, $capabilities ) { public function __construct( $role, $capabilities ) {
$this->name = $role; $this->name = $role;
$this->capabilities = $capabilities; $this->capabilities = $capabilities;
} }
@ -342,7 +342,7 @@ class WP_Role {
* @param string $cap Capability name. * @param string $cap Capability name.
* @param bool $grant Whether role has capability privilege. * @param bool $grant Whether role has capability privilege.
*/ */
function add_cap( $cap, $grant = true ) { public function add_cap( $cap, $grant = true ) {
global $wp_roles; global $wp_roles;
if ( ! isset( $wp_roles ) ) if ( ! isset( $wp_roles ) )
@ -365,7 +365,7 @@ class WP_Role {
* *
* @param string $cap Capability name. * @param string $cap Capability name.
*/ */
function remove_cap( $cap ) { public function remove_cap( $cap ) {
global $wp_roles; global $wp_roles;
if ( ! isset( $wp_roles ) ) if ( ! isset( $wp_roles ) )
@ -389,7 +389,7 @@ class WP_Role {
* @param string $cap Capability name. * @param string $cap Capability name.
* @return bool True, if user has capability. False, if doesn't have capability. * @return bool True, if user has capability. False, if doesn't have capability.
*/ */
function has_cap( $cap ) { public function has_cap( $cap ) {
/** /**
* Filter which capabilities a role has. * Filter which capabilities a role has.
* *
@ -432,7 +432,7 @@ class WP_User {
* @access public * @access public
* @var int * @var int
*/ */
var $ID = 0; public $ID = 0;
/** /**
* The individual capabilities the user has been given. * The individual capabilities the user has been given.
@ -441,7 +441,7 @@ class WP_User {
* @access public * @access public
* @var array * @var array
*/ */
var $caps = array(); public $caps = array();
/** /**
* User metadata option name. * User metadata option name.
@ -450,7 +450,7 @@ class WP_User {
* @access public * @access public
* @var string * @var string
*/ */
var $cap_key; public $cap_key;
/** /**
* The roles the user is part of. * The roles the user is part of.
@ -459,7 +459,7 @@ class WP_User {
* @access public * @access public
* @var array * @var array
*/ */
var $roles = array(); public $roles = array();
/** /**
* All capabilities the user has, including individual and role based. * All capabilities the user has, including individual and role based.
@ -468,7 +468,7 @@ class WP_User {
* @access public * @access public
* @var array * @var array
*/ */
var $allcaps = array(); public $allcaps = array();
/** /**
* The filter context applied to user data fields. * The filter context applied to user data fields.
@ -494,7 +494,7 @@ class WP_User {
* @param int $blog_id Optional Blog ID, defaults to current blog. * @param int $blog_id Optional Blog ID, defaults to current blog.
* @return WP_User * @return WP_User
*/ */
function __construct( $id = 0, $name = '', $blog_id = '' ) { public function __construct( $id = 0, $name = '', $blog_id = '' ) {
if ( ! isset( self::$back_compat_keys ) ) { if ( ! isset( self::$back_compat_keys ) ) {
$prefix = $GLOBALS['wpdb']->prefix; $prefix = $GLOBALS['wpdb']->prefix;
self::$back_compat_keys = array( self::$back_compat_keys = array(
@ -535,7 +535,7 @@ class WP_User {
* @param object $data User DB row object * @param object $data User DB row object
* @param int $blog_id Optional. The blog id to initialize for * @param int $blog_id Optional. The blog id to initialize for
*/ */
function init( $data, $blog_id = '' ) { public function init( $data, $blog_id = '' ) {
$this->data = $data; $this->data = $data;
$this->ID = (int) $data->ID; $this->ID = (int) $data->ID;
@ -551,7 +551,7 @@ class WP_User {
* @param string|int $value The field value * @param string|int $value The field value
* @return object Raw user object * @return object Raw user object
*/ */
static function get_data_by( $field, $value ) { public static function get_data_by( $field, $value ) {
global $wpdb; global $wpdb;
if ( 'id' == $field ) { if ( 'id' == $field ) {
@ -611,7 +611,7 @@ class WP_User {
* *
* @since 3.3.0 * @since 3.3.0
*/ */
function __isset( $key ) { public function __isset( $key ) {
if ( 'id' == $key ) { if ( 'id' == $key ) {
_deprecated_argument( 'WP_User->id', '2.1', __( 'Use <code>WP_User->ID</code> instead.' ) ); _deprecated_argument( 'WP_User->id', '2.1', __( 'Use <code>WP_User->ID</code> instead.' ) );
$key = 'ID'; $key = 'ID';
@ -631,7 +631,7 @@ class WP_User {
* *
* @since 3.3.0 * @since 3.3.0
*/ */
function __get( $key ) { public function __get( $key ) {
if ( 'id' == $key ) { if ( 'id' == $key ) {
_deprecated_argument( 'WP_User->id', '2.1', __( 'Use <code>WP_User->ID</code> instead.' ) ); _deprecated_argument( 'WP_User->id', '2.1', __( 'Use <code>WP_User->ID</code> instead.' ) );
return $this->ID; return $this->ID;
@ -657,7 +657,7 @@ class WP_User {
* *
* @since 3.3.0 * @since 3.3.0
*/ */
function __set( $key, $value ) { public function __set( $key, $value ) {
if ( 'id' == $key ) { if ( 'id' == $key ) {
_deprecated_argument( 'WP_User->id', '2.1', __( 'Use <code>WP_User->ID</code> instead.' ) ); _deprecated_argument( 'WP_User->id', '2.1', __( 'Use <code>WP_User->ID</code> instead.' ) );
$this->ID = $value; $this->ID = $value;
@ -675,7 +675,7 @@ class WP_User {
* *
* @return bool True if user exists in the database, false if not. * @return bool True if user exists in the database, false if not.
*/ */
function exists() { public function exists() {
return ! empty( $this->ID ); return ! empty( $this->ID );
} }
@ -688,7 +688,7 @@ class WP_User {
* *
* @param string $key Property * @param string $key Property
*/ */
function get( $key ) { public function get( $key ) {
return $this->__get( $key ); return $this->__get( $key );
} }
@ -701,7 +701,7 @@ class WP_User {
* *
* @param string $key Property * @param string $key Property
*/ */
function has_prop( $key ) { public function has_prop( $key ) {
return $this->__isset( $key ); return $this->__isset( $key );
} }
@ -712,7 +712,7 @@ class WP_User {
* *
* @return array Array representation. * @return array Array representation.
*/ */
function to_array() { public function to_array() {
return get_object_vars( $this->data ); return get_object_vars( $this->data );
} }
@ -759,7 +759,7 @@ class WP_User {
* *
* @return array List of all capabilities for the user. * @return array List of all capabilities for the user.
*/ */
function get_role_caps() { public function get_role_caps() {
global $wp_roles; global $wp_roles;
if ( ! isset( $wp_roles ) ) if ( ! isset( $wp_roles ) )
@ -790,7 +790,7 @@ class WP_User {
* *
* @param string $role Role name. * @param string $role Role name.
*/ */
function add_role( $role ) { public function add_role( $role ) {
$this->caps[$role] = true; $this->caps[$role] = true;
update_user_meta( $this->ID, $this->cap_key, $this->caps ); update_user_meta( $this->ID, $this->cap_key, $this->caps );
$this->get_role_caps(); $this->get_role_caps();
@ -805,7 +805,7 @@ class WP_User {
* *
* @param string $role Role name. * @param string $role Role name.
*/ */
function remove_role( $role ) { public function remove_role( $role ) {
if ( !in_array($role, $this->roles) ) if ( !in_array($role, $this->roles) )
return; return;
unset( $this->caps[$role] ); unset( $this->caps[$role] );
@ -826,7 +826,7 @@ class WP_User {
* *
* @param string $role Role name. * @param string $role Role name.
*/ */
function set_role( $role ) { public function set_role( $role ) {
if ( 1 == count( $this->roles ) && $role == current( $this->roles ) ) if ( 1 == count( $this->roles ) && $role == current( $this->roles ) )
return; return;
@ -876,7 +876,7 @@ class WP_User {
* @param string $item Level capability name. * @param string $item Level capability name.
* @return int Max Level. * @return int Max Level.
*/ */
function level_reduction( $max, $item ) { public function level_reduction( $max, $item ) {
if ( preg_match( '/^level_(10|[0-9])$/i', $item, $matches ) ) { if ( preg_match( '/^level_(10|[0-9])$/i', $item, $matches ) ) {
$level = intval( $matches[1] ); $level = intval( $matches[1] );
return max( $max, $level ); return max( $max, $level );
@ -895,7 +895,7 @@ class WP_User {
* @since 2.0.0 * @since 2.0.0
* @access public * @access public
*/ */
function update_user_level_from_caps() { public function update_user_level_from_caps() {
global $wpdb; global $wpdb;
$this->user_level = array_reduce( array_keys( $this->allcaps ), array( $this, 'level_reduction' ), 0 ); $this->user_level = array_reduce( array_keys( $this->allcaps ), array( $this, 'level_reduction' ), 0 );
update_user_meta( $this->ID, $wpdb->get_blog_prefix() . 'user_level', $this->user_level ); update_user_meta( $this->ID, $wpdb->get_blog_prefix() . 'user_level', $this->user_level );
@ -910,7 +910,7 @@ class WP_User {
* @param string $cap Capability name. * @param string $cap Capability name.
* @param bool $grant Whether to grant capability to user. * @param bool $grant Whether to grant capability to user.
*/ */
function add_cap( $cap, $grant = true ) { public function add_cap( $cap, $grant = true ) {
$this->caps[$cap] = $grant; $this->caps[$cap] = $grant;
update_user_meta( $this->ID, $this->cap_key, $this->caps ); update_user_meta( $this->ID, $this->cap_key, $this->caps );
} }
@ -923,7 +923,7 @@ class WP_User {
* *
* @param string $cap Capability name. * @param string $cap Capability name.
*/ */
function remove_cap( $cap ) { public function remove_cap( $cap ) {
if ( ! isset( $this->caps[$cap] ) ) if ( ! isset( $this->caps[$cap] ) )
return; return;
unset( $this->caps[$cap] ); unset( $this->caps[$cap] );
@ -936,7 +936,7 @@ class WP_User {
* @since 2.1.0 * @since 2.1.0
* @access public * @access public
*/ */
function remove_all_caps() { public function remove_all_caps() {
global $wpdb; global $wpdb;
$this->caps = array(); $this->caps = array();
delete_user_meta( $this->ID, $this->cap_key ); delete_user_meta( $this->ID, $this->cap_key );
@ -957,7 +957,7 @@ class WP_User {
* @param string|int $cap Capability or role name to search. * @param string|int $cap Capability or role name to search.
* @return bool True, if user has capability; false, if user does not have capability. * @return bool True, if user has capability; false, if user does not have capability.
*/ */
function has_cap( $cap ) { public function has_cap( $cap ) {
if ( is_numeric( $cap ) ) { if ( is_numeric( $cap ) ) {
_deprecated_argument( __FUNCTION__, '2.0', __('Usage of user levels by plugins and themes is deprecated. Use roles and capabilities instead.') ); _deprecated_argument( __FUNCTION__, '2.0', __('Usage of user levels by plugins and themes is deprecated. Use roles and capabilities instead.') );
$cap = $this->translate_level_to_cap( $cap ); $cap = $this->translate_level_to_cap( $cap );
@ -1007,7 +1007,7 @@ class WP_User {
* @param int $level Level number, 1 to 10. * @param int $level Level number, 1 to 10.
* @return string * @return string
*/ */
function translate_level_to_cap( $level ) { public function translate_level_to_cap( $level ) {
return 'level_' . $level; return 'level_' . $level;
} }
@ -1018,7 +1018,7 @@ class WP_User {
* *
* @param int $blog_id Optional Blog ID, defaults to current blog. * @param int $blog_id Optional Blog ID, defaults to current blog.
*/ */
function for_blog( $blog_id = '' ) { public function for_blog( $blog_id = '' ) {
global $wpdb; global $wpdb;
if ( ! empty( $blog_id ) ) if ( ! empty( $blog_id ) )
$cap_key = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities'; $cap_key = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';