<!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>[28500] trunk/src: Fix some `hackificator` odds and ends in `wp-admin`:</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/28500">28500</a></dd>

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

<dt>Date</dt> <dd>2014-05-19 05:03:44 +0000 (Mon, 19 May 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>Fix some `hackificator` odds and ends in `wp-admin`:

* `wp-activate.php` and `wp-admin/themes.php` don't need the closing PHP tag

* Switch single quotes for HTML attribute values to double in a few places

* Convert `include_once file.php` syntax to `include_once( 'file.php' )`

* Add access modifiers to methods/members in: `_WP_List_Table_Compat`, `Walker_Nav_Menu_Edit`, `Walker_Nav_Menu_Checklist`, `WP_Screen`, `Walker_Category_Checklist`

* `edit_user()` doesn't need to import the `$wpdb` global

* `wp_list_widgets()` doesn't need to import the `$sidebars_widgets` global

* switch/endswitch syntax is not supported in Hack

* A `<ul>` in `wp-admin/users.php` is unclosed

See <a href="http://core.trac.wordpress.org/ticket/27881">#27881</a>.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunksrcwpactivatephp">trunk/src/wp-activate.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpcommentslisttablephp">trunk/src/wp-admin/includes/class-wp-comments-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpfilesystemftpsocketsphp">trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswplisttablephp">trunk/src/wp-admin/includes/class-wp-list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesclasswpupgraderskinsphp">trunk/src/wp-admin/includes/class-wp-upgrader-skins.php</a></li>

<li><a href="#trunksrcwpadminincludesexportphp">trunk/src/wp-admin/includes/export.php</a></li>

<li><a href="#trunksrcwpadminincludeslisttablephp">trunk/src/wp-admin/includes/list-table.php</a></li>

<li><a href="#trunksrcwpadminincludesmenuphp">trunk/src/wp-admin/includes/menu.php</a></li>

<li><a href="#trunksrcwpadminincludesnavmenuphp">trunk/src/wp-admin/includes/nav-menu.php</a></li>

<li><a href="#trunksrcwpadminincludesrevisionphp">trunk/src/wp-admin/includes/revision.php</a></li>

<li><a href="#trunksrcwpadminincludesscreenphp">trunk/src/wp-admin/includes/screen.php</a></li>

<li><a href="#trunksrcwpadminincludestaxonomyphp">trunk/src/wp-admin/includes/taxonomy.php</a></li>

<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>

<li><a href="#trunksrcwpadminincludesupdatephp">trunk/src/wp-admin/includes/update.php</a></li>

<li><a href="#trunksrcwpadminincludesuserphp">trunk/src/wp-admin/includes/user.php</a></li>

<li><a href="#trunksrcwpadminincludeswidgetsphp">trunk/src/wp-admin/includes/widgets.php</a></li>

<li><a href="#trunksrcwpadminmediaphp">trunk/src/wp-admin/media.php</a></li>

<li><a href="#trunksrcwpadminnetworkupgradephp">trunk/src/wp-admin/network/upgrade.php</a></li>

<li><a href="#trunksrcwpadminnetworkusersphp">trunk/src/wp-admin/network/users.php</a></li>

<li><a href="#trunksrcwpadminoptionsphp">trunk/src/wp-admin/options.php</a></li>

<li><a href="#trunksrcwpadminrevisionphp">trunk/src/wp-admin/revision.php</a></li>

<li><a href="#trunksrcwpadminthemeeditorphp">trunk/src/wp-admin/theme-editor.php</a></li>

<li><a href="#trunksrcwpadminthemesphp">trunk/src/wp-admin/themes.php</a></li>

<li><a href="#trunksrcwpadminupdatecorephp">trunk/src/wp-admin/update-core.php</a></li>

<li><a href="#trunksrcwpadminupdatephp">trunk/src/wp-admin/update.php</a></li>

<li><a href="#trunksrcwpadminusersphp">trunk/src/wp-admin/users.php</a></li>

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

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunksrcwpactivatephp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-activate.php (28499 => 28500)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-activate.php        2014-05-19 03:22:21 UTC (rev 28499)

+++ trunk/src/wp-activate.php   2014-05-19 05:03:44 UTC (rev 28500)

</span><span class="lines">@@ -128,4 +128,4 @@

</span><span class="cx">  var key_input = document.getElementById('key');

</span><span class="cx">  key_input && key_input.focus();

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

</span><del>-<?php get_footer(); ?>

</del><ins>+<?php get_footer();

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

<a id="trunksrcwpadminincludesclasswpcommentslisttablephp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-comments-list-table.php (28499 => 28500)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-admin/includes/class-wp-comments-list-table.php     2014-05-19 03:22:21 UTC (rev 28499)

+++ trunk/src/wp-admin/includes/class-wp-comments-list-table.php        2014-05-19 05:03:44 UTC (rev 28500)

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

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

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

</span><span class="cx">                          foreach ( $comment_types as $type => $label )

</span><del>-                                       echo "\t<option value='" . esc_attr( $type ) . "'" . selected( $comment_type, $type, false ) . ">$label</option>\n";

</del><ins>+                                        echo "\t" . '<option value="' . esc_attr( $type ) . '"' . selected( $comment_type, $type, false ) . ">$label</option>\n";

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

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

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

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

<a id="trunksrcwpadminincludesclasswpfilesystemftpsocketsphp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php (28499 => 28500)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php   2014-05-19 03:22:21 UTC (rev 28499)

+++ trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php      2014-05-19 05:03:44 UTC (rev 28500)

</span><span class="lines">@@ -24,8 +24,9 @@

</span><span class="cx">          $this->errors = new WP_Error();

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

<span class="cx">          // Check if possible to use ftp functions.

</span><del>-               if ( ! @include_once ABSPATH . 'wp-admin/includes/class-ftp.php' )

-                               return false;

</del><ins>+                if ( ! @include_once( ABSPATH . 'wp-admin/includes/class-ftp.php' ) ) {

+                       return false;

+               }

</ins><span class="cx">           $this->ftp = new ftp();

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

</span><span class="cx">          if ( empty($opt['port']) )

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

<a id="trunksrcwpadminincludesclasswplisttablephp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-list-table.php (28499 => 28500)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-admin/includes/class-wp-list-table.php      2014-05-19 03:22:21 UTC (rev 28499)

+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2014-05-19 05:03:44 UTC (rev 28500)

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

</span><span class="cx">          $m = isset( $_GET['m'] ) ? (int) $_GET['m'] : 0;

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

</span><span class="cx">          <select name="m">

</span><del>-                       <option<?php selected( $m, 0 ); ?> value='0'><?php _e( 'All dates' ); ?></option>

</del><ins>+                        <option<?php selected( $m, 0 ); ?> value="0"><?php _e( 'All dates' ); ?></option>

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

</span><span class="cx">          foreach ( $months as $arc_row ) {

</span><span class="cx">                  if ( 0 == $arc_row->year )

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

<a id="trunksrcwpadminincludesclasswpupgraderskinsphp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-upgrader-skins.php (28499 => 28500)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-admin/includes/class-wp-upgrader-skins.php  2014-05-19 03:22:21 UTC (rev 28499)

+++ trunk/src/wp-admin/includes/class-wp-upgrader-skins.php     2014-05-19 05:03:44 UTC (rev 28500)

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

</span><span class="cx">                  $this->error = $this->upgrader->strings[$error];

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

</span><span class="cx">          if ( is_wp_error($error) ) {

</span><ins>+                       $messages = array();

</ins><span class="cx">                   foreach ( $error->get_error_messages() as $emessage ) {

</span><span class="cx">                          if ( $error->get_error_data() && is_string( $error->get_error_data() ) )

</span><span class="cx">                                  $messages[] = $emessage . ' ' . esc_html( strip_tags( $error->get_error_data() ) );

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

<a id="trunksrcwpadminincludesexportphp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/export.php (28499 => 28500)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-admin/includes/export.php   2014-05-19 03:22:21 UTC (rev 28499)

+++ trunk/src/wp-admin/includes/export.php      2014-05-19 05:03:44 UTC (rev 28500)

</span><span class="lines">@@ -441,8 +441,9 @@

</span><span class="cx">                  <wp:meta_key><?php echo $meta->meta_key; ?></wp:meta_key>

</span><span class="cx">                  <wp:meta_value><?php echo wxr_cdata( $meta->meta_value ); ?></wp:meta_value>

</span><span class="cx">          </wp:postmeta>

</span><del>-<?php       endforeach; ?>

-<?php       $comments = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved <> 'spam'", $post->ID ) );

</del><ins>+<?php        endforeach;

+

+               $comments = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved <> 'spam'", $post->ID ) );

</ins><span class="cx">           foreach ( $comments as $c ) : ?>

</span><span class="cx">          <wp:comment>

</span><span class="cx">                  <wp:comment_id><?php echo $c->comment_ID; ?></wp:comment_id>

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

<a id="trunksrcwpadminincludeslisttablephp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/list-table.php (28499 => 28500)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-admin/includes/list-table.php       2014-05-19 03:22:21 UTC (rev 28499)

+++ trunk/src/wp-admin/includes/list-table.php  2014-05-19 05:03:44 UTC (rev 28500)

</span><span class="lines">@@ -84,10 +84,10 @@

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

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

</span><span class="cx"> class _WP_List_Table_Compat extends WP_List_Table {

</span><del>-       var $_screen;

-       var $_columns;

</del><ins>+        public $_screen;

+       public $_columns;

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

</span><del>-       function _WP_List_Table_Compat( $screen, $columns = array() ) {

</del><ins>+        public function _WP_List_Table_Compat( $screen, $columns = array() ) {

</ins><span class="cx">           if ( is_string( $screen ) )

</span><span class="cx">                  $screen = convert_to_screen( $screen );

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

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

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

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

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

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

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

</ins><span class="cx">           $columns = get_column_headers( $this->_screen );

</span><span class="cx">          $hidden = get_hidden_columns( $this->_screen );

</span><span class="cx">          $sortable = array();

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

</span><span class="cx">          return array( $columns, $hidden, $sortable );

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

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

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

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

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

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

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

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

<a id="trunksrcwpadminincludesmenuphp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/menu.php (28499 => 28500)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-admin/includes/menu.php     2014-05-19 03:22:21 UTC (rev 28499)

+++ trunk/src/wp-admin/includes/menu.php        2014-05-19 05:03:44 UTC (rev 28500)

</span><span class="lines">@@ -71,22 +71,19 @@

</span><span class="cx"> $_wp_submenu_nopriv = array();

</span><span class="cx"> $_wp_menu_nopriv = array();

<span class="cx"> // Loop over submenus and remove pages for which the user does not have privs.

</span><del>-foreach ( array( 'submenu' ) as $sub_loop ) {

-       foreach ($$sub_loop as $parent => $sub) {

-               foreach ($sub as $index => $data) {

-                       if ( ! current_user_can($data[1]) ) {

-                               unset(${$sub_loop}[$parent][$index]);

-                               $_wp_submenu_nopriv[$parent][$data[2]] = true;

-                       }

</del><ins>+foreach ($submenu as $parent => $sub) {

+       foreach ($sub as $index => $data) {

+               if ( ! current_user_can($data[1]) ) {

+                       unset($submenu[$parent][$index]);

+                       $_wp_submenu_nopriv[$parent][$data[2]] = true;

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

</span><del>-               unset($index, $data);

</del><ins>+        }

+       unset($index, $data);

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

</span><del>-               if ( empty(${$sub_loop}[$parent]) )

-                       unset(${$sub_loop}[$parent]);

-       }

-       unset($sub, $parent);

</del><ins>+        if ( empty($submenu[$parent]) )

+               unset($submenu[$parent]);

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

</span><del>-unset($sub_loop);

</del><ins>+unset($sub, $parent);

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

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

<span class="cx">  * Loop over the top-level menu.

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

<a id="trunksrcwpadminincludesnavmenuphp"></a>

<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/nav-menu.php (28499 => 28500)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/src/wp-admin/includes/nav-menu.php 2014-05-19 03:22:21 UTC (rev 28499)

+++ trunk/src/wp-admin/includes/nav-menu.php    2014-05-19 05:03:44 UTC (rev 28500)

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

<span class="cx">   * @param int    $depth  Depth of menu item. Used for padding.