<!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>[28528] trunk/src/wp-includes/user.php: Add access modifiers to `WP_User_Query`.</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/28528">28528</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-19 15:47:33 +0000 (Mon, 19 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add access modifiers to `WP_User_Query`.
Add magic methods for BC: __get(), __set(), __isset(), __unset(), and
__call().
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="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/user.php (28527 => 28528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/user.php 2014-05-19 15:42:00 UTC (rev 28527)
+++ trunk/src/wp-includes/user.php 2014-05-19 15:47:33 UTC (rev 28528)
</span><span class="lines">@@ -449,7 +449,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var array
</span><span class="cx"> */
</span><del>- var $query_vars = array();
</del><ins>+ public $query_vars = array();
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * List of found user ids
</span><span class="lines">@@ -458,7 +458,7 @@
</span><span class="cx"> * @access private
</span><span class="cx"> * @var array
</span><span class="cx"> */
</span><del>- var $results;
</del><ins>+ private $results;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Total number of found users for the current query
</span><span class="lines">@@ -467,14 +467,14 @@
</span><span class="cx"> * @access private
</span><span class="cx"> * @var int
</span><span class="cx"> */
</span><del>- var $total_users = 0;
</del><ins>+ private $total_users = 0;
</ins><span class="cx">
</span><span class="cx"> // SQL clauses
</span><del>- var $query_fields;
- var $query_from;
- var $query_where;
- var $query_orderby;
- var $query_limit;
</del><ins>+ public $query_fields;
+ public $query_from;
+ public $query_where;
+ public $query_orderby;
+ public $query_limit;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * PHP5 constructor.
</span><span class="lines">@@ -484,7 +484,7 @@
</span><span class="cx"> * @param string|array $args Optional. The query variables.
</span><span class="cx"> * @return WP_User_Query
</span><span class="cx"> */
</span><del>- function __construct( $query = null ) {
</del><ins>+ public function __construct( $query = null ) {
</ins><span class="cx"> if ( ! empty( $query ) ) {
</span><span class="cx"> $this->prepare_query( $query );
</span><span class="cx"> $this->query();
</span><span class="lines">@@ -498,7 +498,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string|array $args Optional. The query variables.
</span><span class="cx"> */
</span><del>- function prepare_query( $query = array() ) {
</del><ins>+ public function prepare_query( $query = array() ) {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> if ( empty( $this->query_vars ) || ! empty( $query ) ) {
</span><span class="lines">@@ -712,7 +712,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global wpdb $wpdb WordPress database object for queries.
</span><span class="cx"> */
</span><del>- function query() {
</del><ins>+ public function query() {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> $qv =& $this->query_vars;
</span><span class="lines">@@ -764,7 +764,7 @@
</span><span class="cx"> * @param string $query_var Query variable key.
</span><span class="cx"> * @return mixed
</span><span class="cx"> */
</span><del>- function get( $query_var ) {
</del><ins>+ public function get( $query_var ) {
</ins><span class="cx"> if ( isset( $this->query_vars[$query_var] ) )
</span><span class="cx"> return $this->query_vars[$query_var];
</span><span class="cx">
</span><span class="lines">@@ -780,7 +780,7 @@
</span><span class="cx"> * @param string $query_var Query variable key.
</span><span class="cx"> * @param mixed $value Query variable value.
</span><span class="cx"> */
</span><del>- function set( $query_var, $value ) {
</del><ins>+ public function set( $query_var, $value ) {
</ins><span class="cx"> $this->query_vars[$query_var] = $value;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -796,7 +796,7 @@
</span><span class="cx"> * single site. Single site allows leading and trailing wildcards, Network Admin only trailing.
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><del>- function get_search_sql( $string, $cols, $wild = false ) {
</del><ins>+ protected function get_search_sql( $string, $cols, $wild = false ) {
</ins><span class="cx"> $string = esc_sql( $string );
</span><span class="cx">
</span><span class="cx"> $searches = array();
</span><span class="lines">@@ -820,7 +820,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @return array Array of results.
</span><span class="cx"> */
</span><del>- function get_results() {
</del><ins>+ public function get_results() {
</ins><span class="cx"> return $this->results;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -832,9 +832,66 @@
</span><span class="cx"> *
</span><span class="cx"> * @return array Array of total users.
</span><span class="cx"> */
</span><del>- function get_total() {
</del><ins>+ public function get_total() {
</ins><span class="cx"> return $this->total_users;
</span><span class="cx"> }
</span><ins>+
+ /**
+ * Make private properties readable for backwards compatibility
+ *
+ * @since 4.0.0
+ * @param string $name
+ * @return mixed
+ */
+ public function __get( $name ) {
+ return $this->$name;
+ }
+
+ /**
+ * Make private properties setable for backwards compatibility
+ *
+ * @since 4.0.0
+ * @param string $name
+ * @param string $value
+ * @return mixed
+ */
+ public function __set( $name, $value ) {
+ return $this->$name = $value;
+ }
+
+ /**
+ * Make private properties checkable for backwards compatibility
+ *
+ * @since 4.0.0
+ * @param string $name
+ * @return mixed
+ */
+ public function __isset( $name ) {
+ return isset( $this->$name );
+ }
+
+ /**
+ * Make private properties unsetable for backwards compatibility
+ *
+ * @since 4.0.0
+ * @param string $name
+ * @return mixed
+ */
+ public function __unset( $name ) {
+ unset( $this->$name );
+ }
+
+ /**
+ * 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"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>