<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[28503] trunk/src/wp-includes/capabilities.php: Add access modifiers to methods/members in `WP_Roles`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28503">28503</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-19 05:19:36 +0000 (Mon, 19 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add access modifiers to methods/members in `WP_Roles`. Add a magic `__call()` method for BC.
See <a href="http://core.trac.wordpress.org/ticket/27881">#27881</a>, <a href="http://core.trac.wordpress.org/ticket/22234">#22234</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescapabilitiesphp">trunk/src/wp-includes/capabilities.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/capabilities.php (28502 => 28503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/capabilities.php 2014-05-19 05:15:20 UTC (rev 28502)
+++ trunk/src/wp-includes/capabilities.php 2014-05-19 05:19:36 UTC (rev 28503)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var array
</span><span class="cx"> */
</span><del>- var $roles;
</del><ins>+ public $roles;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * List of the role objects.
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var array
</span><span class="cx"> */
</span><del>- var $role_objects = array();
</del><ins>+ public $role_objects = array();
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * List of role names.
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var array
</span><span class="cx"> */
</span><del>- var $role_names = array();
</del><ins>+ public $role_names = array();
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Option name for storing role list.
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- var $role_key;
</del><ins>+ public $role_key;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Whether to use the database for retrieval and storage.
</span><span class="lines">@@ -70,18 +70,30 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var bool
</span><span class="cx"> */
</span><del>- var $use_db = true;
</del><ins>+ public $use_db = true;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Constructor
</span><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span><span class="cx"> */
</span><del>- function __construct() {
</del><ins>+ public function __construct() {
</ins><span class="cx"> $this->_init();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Make private/protected methods readable for backwards compatibility
+ *
+ * @since 4.0.0
+ * @param string $name
+ * @param array $arguments
+ * @return mixed
+ */
+ public function __call( $name, $arguments ) {
+ return call_user_func_array( array( $this, $name ), $arguments );
+ }
+
+ /**
</ins><span class="cx"> * Set up the object properties.
</span><span class="cx"> *
</span><span class="cx"> * The role key is set to the current prefix for the $wpdb object with
</span><span class="lines">@@ -93,7 +105,7 @@
</span><span class="cx"> * @uses $wpdb Used to get the database prefix.
</span><span class="cx"> * @global array $wp_user_roles Used to set the 'roles' property value.
</span><span class="cx"> */
</span><del>- function _init () {
</del><ins>+ protected function _init() {
</ins><span class="cx"> global $wpdb, $wp_user_roles;
</span><span class="cx"> $this->role_key = $wpdb->get_blog_prefix() . 'user_roles';
</span><span class="cx"> if ( ! empty( $wp_user_roles ) ) {
</span><span class="lines">@@ -123,7 +135,7 @@
</span><span class="cx"> * @since 3.5.0
</span><span class="cx"> * @access public
</span><span class="cx"> */
</span><del>- function reinit() {
</del><ins>+ public function reinit() {
</ins><span class="cx"> // There is no need to reinit if using the wp_user_roles global.
</span><span class="cx"> if ( ! $this->use_db )
</span><span class="cx"> return;
</span><span class="lines">@@ -160,7 +172,7 @@
</span><span class="cx"> * @param array $capabilities List of role capabilities in the above format.
</span><span class="cx"> * @return WP_Role|null WP_Role object if role is added, null if already exists.
</span><span class="cx"> */
</span><del>- function add_role( $role, $display_name, $capabilities = array() ) {
</del><ins>+ public function add_role( $role, $display_name, $capabilities = array() ) {
</ins><span class="cx"> if ( isset( $this->roles[$role] ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -183,7 +195,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $role Role name.
</span><span class="cx"> */
</span><del>- function remove_role( $role ) {
</del><ins>+ public function remove_role( $role ) {
</ins><span class="cx"> if ( ! isset( $this->role_objects[$role] ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -208,7 +220,7 @@
</span><span class="cx"> * @param string $cap Capability name.
</span><span class="cx"> * @param bool $grant Optional, default is true. Whether role is capable of performing capability.
</span><span class="cx"> */
</span><del>- function add_cap( $role, $cap, $grant = true ) {
</del><ins>+ public function add_cap( $role, $cap, $grant = true ) {
</ins><span class="cx"> if ( ! isset( $this->roles[$role] ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -226,7 +238,7 @@
</span><span class="cx"> * @param string $role Role name.
</span><span class="cx"> * @param string $cap Capability name.
</span><span class="cx"> */
</span><del>- function remove_cap( $role, $cap ) {
</del><ins>+ public function remove_cap( $role, $cap ) {
</ins><span class="cx"> if ( ! isset( $this->roles[$role] ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -244,7 +256,7 @@
</span><span class="cx"> * @param string $role Role name.
</span><span class="cx"> * @return WP_Role|null WP_Role object if found, null if the role does not exist.
</span><span class="cx"> */
</span><del>- function get_role( $role ) {
</del><ins>+ public function get_role( $role ) {
</ins><span class="cx"> if ( isset( $this->role_objects[$role] ) )
</span><span class="cx"> return $this->role_objects[$role];
</span><span class="cx"> else
</span><span class="lines">@@ -259,7 +271,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @return array List of role names.
</span><span class="cx"> */
</span><del>- function get_names() {
</del><ins>+ public function get_names() {
</ins><span class="cx"> return $this->role_names;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -272,7 +284,7 @@
</span><span class="cx"> * @param string $role Role name to look up.
</span><span class="cx"> * @return bool
</span><span class="cx"> */
</span><del>- function is_role( $role ) {
</del><ins>+ public function is_role( $role ) {
</ins><span class="cx"> return isset( $this->role_names[$role] );
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>