<!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>[29118] trunk/src/wp-admin/includes: Repent for our original OOP sins and doc blocks as pertains to access modifiers in List Table + subclasses.</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/29118">29118</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-07-12 03:26:40 +0000 (Sat, 12 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Repent for our original OOP sins and doc blocks as pertains to access modifiers in List Table + subclasses.
Props SergeyBiryukov.
See <a href="http://core.trac.wordpress.org/ticket/28843">#28843</a> and <a href="http://core.trac.wordpress.org/changeset/28583">[28583]</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswplinkslisttablephp">trunk/src/wp-admin/includes/class-wp-links-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswplisttablephp">trunk/src/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmedialisttablephp">trunk/src/wp-admin/includes/class-wp-media-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmssiteslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsuserslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpplugininstalllisttablephp">trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppluginslisttablephp">trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppostslisttablephp">trunk/src/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswptermslisttablephp">trunk/src/wp-admin/includes/class-wp-terms-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-themes-list-table.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswplinkslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-links-list-table.php (29117 => 29118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-links-list-table.php 2014-07-12 00:53:08 UTC (rev 29117)
+++ trunk/src/wp-admin/includes/class-wp-links-list-table.php 2014-07-12 03:26:40 UTC (rev 29118)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><del>- protected function get_columns() {
</del><ins>+ public function get_columns() {
</ins><span class="cx"> return array(
</span><span class="cx"> 'cb' => '<input type="checkbox" />',
</span><span class="cx"> 'name' => _x( 'Name', 'link name' ),
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-list-table.php (29117 => 29118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-list-table.php 2014-07-12 00:53:08 UTC (rev 29117)
+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2014-07-12 03:26:40 UTC (rev 29118)
</span><span class="lines">@@ -538,11 +538,11 @@
</span><span class="cx"> * Get the current page number
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><del>- * @access protected
</del><ins>+ * @access public
</ins><span class="cx"> *
</span><span class="cx"> * @return int
</span><span class="cx"> */
</span><del>- protected function get_pagenum() {
</del><ins>+ public function get_pagenum() {
</ins><span class="cx"> $pagenum = isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 0;
</span><span class="cx">
</span><span class="cx"> if( isset( $this->_pagination_args['total_pages'] ) && $pagenum > $this->_pagination_args['total_pages'] )
</span><span class="lines">@@ -675,12 +675,12 @@
</span><span class="cx"> * 'internal-name' => 'Title'
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><del>- * @access protected
</del><ins>+ * @access public
</ins><span class="cx"> * @abstract
</span><span class="cx"> *
</span><span class="cx"> * @return array
</span><span class="cx"> */
</span><del>- protected function get_columns() {
</del><ins>+ public function get_columns() {
</ins><span class="cx"> die( 'function WP_List_Table::get_columns() must be over-ridden in a sub-class.' );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmedialisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-media-list-table.php (29117 => 29118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-media-list-table.php 2014-07-12 00:53:08 UTC (rev 29117)
+++ trunk/src/wp-admin/includes/class-wp-media-list-table.php 2014-07-12 03:26:40 UTC (rev 29118)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><del>- protected function get_columns() {
</del><ins>+ public function get_columns() {
</ins><span class="cx"> $posts_columns = array();
</span><span class="cx"> $posts_columns['cb'] = '<input type="checkbox" />';
</span><span class="cx"> $posts_columns['icon'] = '';
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmssiteslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php (29117 => 29118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2014-07-12 00:53:08 UTC (rev 29117)
+++ trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2014-07-12 03:26:40 UTC (rev 29118)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> $this->view_switcher( $mode );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- protected function get_columns() {
</del><ins>+ public function get_columns() {
</ins><span class="cx"> $blogname_columns = ( is_subdomain_install() ) ? __( 'Domain' ) : __( 'Path' );
</span><span class="cx"> $sites_columns = array(
</span><span class="cx"> 'cb' => '<input type="checkbox" />',
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmsthemeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php (29117 => 29118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2014-07-12 00:53:08 UTC (rev 29117)
+++ trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2014-07-12 03:26:40 UTC (rev 29118)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> _e( 'You do not appear to have any themes available at this time.' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- protected function get_columns() {
</del><ins>+ public function get_columns() {
</ins><span class="cx"> global $status;
</span><span class="cx">
</span><span class="cx"> return array(
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmsuserslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php (29117 => 29118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php 2014-07-12 00:53:08 UTC (rev 29117)
+++ trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php 2014-07-12 03:26:40 UTC (rev 29118)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> $this->view_switcher( $mode );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- protected function get_columns() {
</del><ins>+ public function get_columns() {
</ins><span class="cx"> $users_columns = array(
</span><span class="cx"> 'cb' => '<input type="checkbox" />',
</span><span class="cx"> 'username' => __( 'Username' ),
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpplugininstalllisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php (29117 => 29118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2014-07-12 00:53:08 UTC (rev 29117)
+++ trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2014-07-12 03:26:40 UTC (rev 29118)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> return array( 'widefat', $this->_args['plural'] );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- protected function get_columns() {
</del><ins>+ public function get_columns() {
</ins><span class="cx"> return array(
</span><span class="cx"> 'name' => _x( 'Name', 'plugin name' ),
</span><span class="cx"> 'version' => __( 'Version' ),
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppluginslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-plugins-list-table.php (29117 => 29118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2014-07-12 00:53:08 UTC (rev 29117)
+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2014-07-12 03:26:40 UTC (rev 29118)
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> _e( 'You do not appear to have any plugins available at this time.' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- protected function get_columns() {
</del><ins>+ public function get_columns() {
</ins><span class="cx"> global $status;
</span><span class="cx">
</span><span class="cx"> return array(
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-posts-list-table.php (29117 => 29118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2014-07-12 00:53:08 UTC (rev 29117)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2014-07-12 03:26:40 UTC (rev 29118)
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx"> return array( 'widefat', 'fixed', is_post_type_hierarchical( $this->screen->post_type ) ? 'pages' : 'posts' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- protected function get_columns() {
</del><ins>+ public function get_columns() {
</ins><span class="cx"> $post_type = $this->screen->post_type;
</span><span class="cx">
</span><span class="cx"> $posts_columns = array();
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswptermslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-terms-list-table.php (29117 => 29118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2014-07-12 00:53:08 UTC (rev 29117)
+++ trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2014-07-12 03:26:40 UTC (rev 29118)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> return parent::current_action();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- protected function get_columns() {
</del><ins>+ public function get_columns() {
</ins><span class="cx"> $columns = array(
</span><span class="cx"> 'cb' => '<input type="checkbox" />',
</span><span class="cx"> 'name' => _x( 'Name', 'term name' ),
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpthemeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-themes-list-table.php (29117 => 29118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-themes-list-table.php 2014-07-12 00:53:08 UTC (rev 29117)
+++ trunk/src/wp-admin/includes/class-wp-themes-list-table.php 2014-07-12 03:26:40 UTC (rev 29118)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><del>- protected function get_columns() {
</del><ins>+ public function get_columns() {
</ins><span class="cx"> return array();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>