<!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>[28533] trunk/src/wp-includes: `WP_Query` was only missing one access modifier.</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/28533">28533</a></dd>

<dt>Author</dt> <dd>wonderboymusic</dd>

<dt>Date</dt> <dd>2014-05-19 17:40:08 +0000 (Mon, 19 May 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>`WP_Query` was only missing one access modifier.

Add access modifier (`public`) to applicable class methods/members of `WP_Rewrite`. I am not brave enough to set some of the `var`s to `private` without more testing.

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="#trunksrcwpincludesqueryphp">trunk/src/wp-includes/query.php</a></li>

<li><a href="#trunksrcwpincludesrewritephp">trunk/src/wp-includes/rewrite.php</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunksrcwpincludesqueryphp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-includes/query.php (28532 => 28533)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-includes/query.php  2014-05-19 17:29:42 UTC (rev 28532)

+++ trunk/src/wp-includes/query.php     2014-05-19 17:40:08 UTC (rev 28533)

</span><span class="lines">@@ -3422,7 +3422,7 @@

</span><span class="cx">   * @since 3.5.0

</span><span class="cx">   * @access private

</span><span class="cx">   */

</span><del>-       function set_found_posts( $q, $limits ) {

</del><ins>+        private function set_found_posts( $q, $limits ) {

</ins><span class="cx">           global $wpdb;

</span><span class="cx"> 

</span><span class="cx">          // Bail if posts is an empty array. Continue if posts is an empty string,

</span></span></pre></div>

<a id="trunksrcwpincludesrewritephp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-includes/rewrite.php (28532 => 28533)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-includes/rewrite.php        2014-05-19 17:29:42 UTC (rev 28532)

+++ trunk/src/wp-includes/rewrite.php   2014-05-19 17:40:08 UTC (rev 28533)

</span><span class="lines">@@ -571,7 +571,7 @@

</span><span class="cx">   * @access public

</span><span class="cx">   * @var string

</span><span class="cx">   */

</span><del>-       var $index = 'index.php';

</del><ins>+        public $index = 'index.php';

</ins><span class="cx"> 

</span><span class="cx">  /**

<span class="cx">   * Variable name to use for regex matches in the rewritten query.

</span><span class="lines">@@ -654,7 +654,7 @@

</span><span class="cx">   * @access public

</span><span class="cx">   * @var bool

</span><span class="cx">   */

</span><del>-       var $use_verbose_rules = false;

</del><ins>+        public $use_verbose_rules = false;

</ins><span class="cx"> 

</span><span class="cx">  /**

<span class="cx">   * Could post permalinks be confused with those of pages?

</span><span class="lines">@@ -672,7 +672,7 @@

</span><span class="cx">   * @access public

</span><span class="cx">   * @var bool

</span><span class="cx">   */

</span><del>-       var $use_verbose_page_rules = true;

</del><ins>+        public $use_verbose_page_rules = true;

</ins><span class="cx"> 

</span><span class="cx">  /**

<span class="cx">   * Rewrite tags that can be used in permalink structures.

</span><span class="lines">@@ -763,7 +763,7 @@

</span><span class="cx">   *

<span class="cx">   * @return bool True, if permalinks are enabled.

</span><span class="cx">   */

</span><del>-       function using_permalinks() {

</del><ins>+        public function using_permalinks() {

</ins><span class="cx">           return ! empty($this->permalink_structure);

</span><span class="cx">  }

</span><span class="cx"> 

</span><span class="lines">@@ -777,7 +777,7 @@

</span><span class="cx">   *

</span><span class="cx">   * @return bool

</span><span class="cx">   */

</span><del>-       function using_index_permalinks() {

</del><ins>+        public function using_index_permalinks() {

</ins><span class="cx">           if ( empty($this->permalink_structure) )

</span><span class="cx">                  return false;

</span><span class="cx"> 

</span><span class="lines">@@ -798,7 +798,7 @@

</span><span class="cx">   *

</span><span class="cx">   * @return bool

</span><span class="cx">   */

</span><del>-       function using_mod_rewrite_permalinks() {

</del><ins>+        public function using_mod_rewrite_permalinks() {

</ins><span class="cx">           if ( $this->using_permalinks() && ! $this->using_index_permalinks() )

</span><span class="cx">                  return true;

</span><span class="cx">          else

</span><span class="lines">@@ -821,7 +821,7 @@

<span class="cx">   * @param int $number Index number.

</span><span class="cx">   * @return string

</span><span class="cx">   */

</span><del>-       function preg_index($number) {

</del><ins>+        public function preg_index($number) {

</ins><span class="cx">           $match_prefix = '$';

</span><span class="cx">          $match_suffix = '';

</span><span class="cx"> 

</span><span class="lines">@@ -844,7 +844,7 @@

</span><span class="cx">   *

<span class="cx">   * @return array Array of page URIs as first element and attachment URIs as second element.

</span><span class="cx">   */

</span><del>-       function page_uri_index() {

</del><ins>+        public function page_uri_index() {

</ins><span class="cx">           global $wpdb;

</span><span class="cx"> 

</span><span class="cx">          //get pages in order of hierarchy, i.e. children after parents

</span><span class="lines">@@ -886,7 +886,7 @@

</span><span class="cx">   *

</span><span class="cx">   * @return array

</span><span class="cx">   */

</span><del>-       function page_rewrite_rules() {

</del><ins>+        public function page_rewrite_rules() {

</ins><span class="cx">           // the extra .? at the beginning prevents clashes with other regular expressions in the rules array

</span><span class="cx">          $this->add_rewrite_tag( '%pagename%', '(.?.+?)', 'pagename=' );

</span><span class="cx"> 

</span><span class="lines">@@ -913,7 +913,7 @@

</span><span class="cx">   *

<span class="cx">   * @return bool|string False on no permalink structure. Date permalink structure.

</span><span class="cx">   */

</span><del>-       function get_date_permastruct() {

</del><ins>+        public function get_date_permastruct() {

</ins><span class="cx">           if ( isset($this->date_structure) )

</span><span class="cx">                  return $this->date_structure;

</span><span class="cx"> 

</span><span class="lines">@@ -967,7 +967,7 @@

</span><span class="cx">   *

<span class="cx">   * @return bool|string False on failure. Year structure on success.

</span><span class="cx">   */

</span><del>-       function get_year_permastruct() {

</del><ins>+        public function get_year_permastruct() {

</ins><span class="cx">           $structure = $this->get_date_permastruct();

</span><span class="cx"> 

</span><span class="cx">          if ( empty($structure) )

</span><span class="lines">@@ -992,7 +992,7 @@

</span><span class="cx">   *

<span class="cx">   * @return bool|string False on failure. Year/Month structure on success.

</span><span class="cx">   */

</span><del>-       function get_month_permastruct() {

</del><ins>+        public function get_month_permastruct() {

</ins><span class="cx">           $structure = $this->get_date_permastruct();

</span><span class="cx"> 

</span><span class="cx">          if ( empty($structure) )

</span><span class="lines">@@ -1015,7 +1015,7 @@

</span><span class="cx">   *

<span class="cx">   * @return bool|string False on failure. Year/Month/Day structure on success.

</span><span class="cx">   */

</span><del>-       function get_day_permastruct() {

</del><ins>+        public function get_day_permastruct() {

</ins><span class="cx">           return $this->get_date_permastruct();

</span><span class="cx">  }

</span><span class="cx"> 

</span><span class="lines">@@ -1032,7 +1032,7 @@

</span><span class="cx">   *

<span class="cx">   * @return bool|string False on failure. Category permalink structure.

</span><span class="cx">   */

</span><del>-       function get_category_permastruct() {

</del><ins>+        public function get_category_permastruct() {

</ins><span class="cx">           return $this->get_extra_permastruct('category');

</span><span class="cx">  }

</span><span class="cx"> 

</span><span class="lines">@@ -1049,7 +1049,7 @@

</span><span class="cx">   *

<span class="cx">   * @return bool|string False on failure. Tag permalink structure.

</span><span class="cx">   */

</span><del>-       function get_tag_permastruct() {

</del><ins>+        public function get_tag_permastruct() {

</ins><span class="cx">           return $this->get_extra_permastruct('post_tag');

</span><span class="cx">  }

</span><span class="cx"> 

</span><span class="lines">@@ -1062,7 +1062,7 @@

<span class="cx">   * @param string $name Permalink structure name.