diff --git a/wp-admin/includes/list-table.php b/wp-admin/includes/list-table.php
index ef87d32649..86b1e60fa5 100644
--- a/wp-admin/includes/list-table.php
+++ b/wp-admin/includes/list-table.php
@@ -87,7 +87,7 @@ class _WP_List_Table_Compat extends WP_List_Table {
public $_screen;
public $_columns;
- public function _WP_List_Table_Compat( $screen, $columns = array() ) {
+ public function __construct( $screen, $columns = array() ) {
if ( is_string( $screen ) )
$screen = convert_to_screen( $screen );
diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index df65404dc5..198205ad64 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -304,7 +304,7 @@ class WP_Role {
* @access public
* @var string
*/
- var $name;
+ public $name;
/**
* List of capabilities the role contains.
@@ -313,7 +313,7 @@ class WP_Role {
* @access public
* @var array
*/
- var $capabilities;
+ public $capabilities;
/**
* Constructor - Set up object properties.
@@ -327,7 +327,7 @@ class WP_Role {
* @param string $role Role name.
* @param array $capabilities List of capabilities.
*/
- function __construct( $role, $capabilities ) {
+ public function __construct( $role, $capabilities ) {
$this->name = $role;
$this->capabilities = $capabilities;
}
@@ -342,7 +342,7 @@ class WP_Role {
* @param string $cap Capability name.
* @param bool $grant Whether role has capability privilege.
*/
- function add_cap( $cap, $grant = true ) {
+ public function add_cap( $cap, $grant = true ) {
global $wp_roles;
if ( ! isset( $wp_roles ) )
@@ -365,7 +365,7 @@ class WP_Role {
*
* @param string $cap Capability name.
*/
- function remove_cap( $cap ) {
+ public function remove_cap( $cap ) {
global $wp_roles;
if ( ! isset( $wp_roles ) )
@@ -389,7 +389,7 @@ class WP_Role {
* @param string $cap Capability name.
* @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.
*
@@ -432,7 +432,7 @@ class WP_User {
* @access public
* @var int
*/
- var $ID = 0;
+ public $ID = 0;
/**
* The individual capabilities the user has been given.
@@ -441,7 +441,7 @@ class WP_User {
* @access public
* @var array
*/
- var $caps = array();
+ public $caps = array();
/**
* User metadata option name.
@@ -450,7 +450,7 @@ class WP_User {
* @access public
* @var string
*/
- var $cap_key;
+ public $cap_key;
/**
* The roles the user is part of.
@@ -459,7 +459,7 @@ class WP_User {
* @access public
* @var array
*/
- var $roles = array();
+ public $roles = array();
/**
* All capabilities the user has, including individual and role based.
@@ -468,7 +468,7 @@ class WP_User {
* @access public
* @var array
*/
- var $allcaps = array();
+ public $allcaps = array();
/**
* 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.
* @return WP_User
*/
- function __construct( $id = 0, $name = '', $blog_id = '' ) {
+ public function __construct( $id = 0, $name = '', $blog_id = '' ) {
if ( ! isset( self::$back_compat_keys ) ) {
$prefix = $GLOBALS['wpdb']->prefix;
self::$back_compat_keys = array(
@@ -535,7 +535,7 @@ class WP_User {
* @param object $data User DB row object
* @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->ID = (int) $data->ID;
@@ -551,7 +551,7 @@ class WP_User {
* @param string|int $value The field value
* @return object Raw user object
*/
- static function get_data_by( $field, $value ) {
+ public static function get_data_by( $field, $value ) {
global $wpdb;
if ( 'id' == $field ) {
@@ -611,7 +611,7 @@ class WP_User {
*
* @since 3.3.0
*/
- function __isset( $key ) {
+ public function __isset( $key ) {
if ( 'id' == $key ) {
_deprecated_argument( 'WP_User->id', '2.1', __( 'Use WP_User->ID instead.' ) );
$key = 'ID';
@@ -631,7 +631,7 @@ class WP_User {
*
* @since 3.3.0
*/
- function __get( $key ) {
+ public function __get( $key ) {
if ( 'id' == $key ) {
_deprecated_argument( 'WP_User->id', '2.1', __( 'Use WP_User->ID instead.' ) );
return $this->ID;
@@ -657,7 +657,7 @@ class WP_User {
*
* @since 3.3.0
*/
- function __set( $key, $value ) {
+ public function __set( $key, $value ) {
if ( 'id' == $key ) {
_deprecated_argument( 'WP_User->id', '2.1', __( 'Use WP_User->ID instead.' ) );
$this->ID = $value;
@@ -675,7 +675,7 @@ class WP_User {
*
* @return bool True if user exists in the database, false if not.
*/
- function exists() {
+ public function exists() {
return ! empty( $this->ID );
}
@@ -688,7 +688,7 @@ class WP_User {
*
* @param string $key Property
*/
- function get( $key ) {
+ public function get( $key ) {
return $this->__get( $key );
}
@@ -701,7 +701,7 @@ class WP_User {
*
* @param string $key Property
*/
- function has_prop( $key ) {
+ public function has_prop( $key ) {
return $this->__isset( $key );
}
@@ -712,7 +712,7 @@ class WP_User {
*
* @return array Array representation.
*/
- function to_array() {
+ public function to_array() {
return get_object_vars( $this->data );
}
@@ -759,7 +759,7 @@ class WP_User {
*
* @return array List of all capabilities for the user.
*/
- function get_role_caps() {
+ public function get_role_caps() {
global $wp_roles;
if ( ! isset( $wp_roles ) )
@@ -790,7 +790,7 @@ class WP_User {
*
* @param string $role Role name.
*/
- function add_role( $role ) {
+ public function add_role( $role ) {
$this->caps[$role] = true;
update_user_meta( $this->ID, $this->cap_key, $this->caps );
$this->get_role_caps();
@@ -805,7 +805,7 @@ class WP_User {
*
* @param string $role Role name.
*/
- function remove_role( $role ) {
+ public function remove_role( $role ) {
if ( !in_array($role, $this->roles) )
return;
unset( $this->caps[$role] );
@@ -826,7 +826,7 @@ class WP_User {
*
* @param string $role Role name.
*/
- function set_role( $role ) {
+ public function set_role( $role ) {
if ( 1 == count( $this->roles ) && $role == current( $this->roles ) )
return;
@@ -876,7 +876,7 @@ class WP_User {
* @param string $item Level capability name.
* @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 ) ) {
$level = intval( $matches[1] );
return max( $max, $level );
@@ -895,7 +895,7 @@ class WP_User {
* @since 2.0.0
* @access public
*/
- function update_user_level_from_caps() {
+ public function update_user_level_from_caps() {
global $wpdb;
$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 );
@@ -910,7 +910,7 @@ class WP_User {
* @param string $cap Capability name.
* @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;
update_user_meta( $this->ID, $this->cap_key, $this->caps );
}
@@ -923,7 +923,7 @@ class WP_User {
*
* @param string $cap Capability name.
*/
- function remove_cap( $cap ) {
+ public function remove_cap( $cap ) {
if ( ! isset( $this->caps[$cap] ) )
return;
unset( $this->caps[$cap] );
@@ -936,7 +936,7 @@ class WP_User {
* @since 2.1.0
* @access public
*/
- function remove_all_caps() {
+ public function remove_all_caps() {
global $wpdb;
$this->caps = array();
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.
* @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 ) ) {
_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 );
@@ -1007,7 +1007,7 @@ class WP_User {
* @param int $level Level number, 1 to 10.
* @return string
*/
- function translate_level_to_cap( $level ) {
+ public function translate_level_to_cap( $level ) {
return 'level_' . $level;
}
@@ -1018,7 +1018,7 @@ class WP_User {
*
* @param int $blog_id Optional Blog ID, defaults to current blog.
*/
- function for_blog( $blog_id = '' ) {
+ public function for_blog( $blog_id = '' ) {
global $wpdb;
if ( ! empty( $blog_id ) )
$cap_key = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';