<!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>[24189] trunk: Fix usage of undeclared variables.</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/24189">24189</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-05-07 16:35:03 +0000 (Tue, 07 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix usage of undeclared variables.
 * the_weekday_date() needs the global $currentday
 * ms_site_check() needs the global $current_site
 * media list table does not need to check for $total_orphans
 * upgrader has no $feedback variable, appears to be copypasta from other upgrade APIs
 * install_themes_feature_list() has no $features variable, return array() instead of a new return type of WP_Error

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

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpmedialisttablephp">trunk/wp-admin/includes/class-wp-media-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpupgraderphp">trunk/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunkwpadminincludesthemeinstallphp">trunk/wp-admin/includes/theme-install.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpincludesmsloadphp">trunk/wp-includes/ms-load.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpmedialisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-media-list-table.php (24188 => 24189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-media-list-table.php    2013-05-07 15:55:31 UTC (rev 24188)
+++ trunk/wp-admin/includes/class-wp-media-list-table.php       2013-05-07 16:35:03 UTC (rev 24189)
</span><span class="lines">@@ -47,8 +47,7 @@
</span><span class="cx">          $type_links = array();
</span><span class="cx">          $_num_posts = (array) wp_count_attachments();
</span><span class="cx">          $_total_posts = array_sum($_num_posts) - $_num_posts['trash'];
</span><del>-               if ( !isset( $total_orphans ) )
-                               $total_orphans = $wpdb->get_var( "SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent < 1" );
</del><ins>+                $total_orphans = $wpdb->get_var( "SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent < 1" );
</ins><span class="cx">           $matches = wp_match_mime_types(array_keys($post_mime_types), array_keys($_num_posts));
</span><span class="cx">          foreach ( $matches as $type => $reals )
</span><span class="cx">                  foreach ( $reals as $real )
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-upgrader.php (24188 => 24189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php    2013-05-07 15:55:31 UTC (rev 24188)
+++ trunk/wp-admin/includes/class-wp-upgrader.php       2013-05-07 16:35:03 UTC (rev 24189)
</span><span class="lines">@@ -1029,9 +1029,6 @@
</span><span class="cx">          $this->init();
</span><span class="cx">          $this->upgrade_strings();
</span><span class="cx"> 
</span><del>-               if ( !empty($feedback) )
-                       add_filter('update_feedback', $feedback);
-
</del><span class="cx">           // Is an update available?
</span><span class="cx">          if ( !isset( $current->response ) || $current->response == 'latest' )
</span><span class="cx">                  return new WP_Error('up_to_date', $this->strings['up_to_date']);
</span></span></pre></div>
<a id="trunkwpadminincludesthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme-install.php (24188 => 24189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme-install.php        2013-05-07 15:55:31 UTC (rev 24188)
+++ trunk/wp-admin/includes/theme-install.php   2013-05-07 16:35:03 UTC (rev 24189)
</span><span class="lines">@@ -29,6 +29,8 @@
</span><span class="cx">  * @return array
</span><span class="cx">  */
</span><span class="cx"> function install_themes_feature_list() {
</span><ins>+       _deprecated_function( __FUNCTION__, '3.1', 'get_theme_feature_list()' );
+
</ins><span class="cx">   if ( !$cache = get_transient( 'wporg_theme_feature_list' ) )
</span><span class="cx">          set_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
</span><span class="cx"> 
</span><span class="lines">@@ -37,7 +39,7 @@
</span><span class="cx"> 
</span><span class="cx">  $feature_list = themes_api( 'feature_list', array() );
</span><span class="cx">  if ( is_wp_error( $feature_list ) )
</span><del>-               return $features;
</del><ins>+                return array();
</ins><span class="cx"> 
</span><span class="cx">  set_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS );
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (24188 => 24189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php   2013-05-07 15:55:31 UTC (rev 24188)
+++ trunk/wp-includes/general-template.php      2013-05-07 16:35:03 UTC (rev 24189)
</span><span class="lines">@@ -1579,7 +1579,7 @@
</span><span class="cx">  * @param string $after Optional Output after the date.
</span><span class="cx">  */
</span><span class="cx"> function the_weekday_date($before='',$after='') {
</span><del>-       global $wp_locale, $day, $previousweekday;
</del><ins>+        global $wp_locale, $currentday, $previousweekday;
</ins><span class="cx">   $the_weekday_date = '';
</span><span class="cx">  if ( $currentday != $previousweekday ) {
</span><span class="cx">          $the_weekday_date .= $before;
</span></span></pre></div>
<a id="trunkwpincludesmsloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-load.php (24188 => 24189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-load.php    2013-05-07 15:55:31 UTC (rev 24188)
+++ trunk/wp-includes/ms-load.php       2013-05-07 16:35:03 UTC (rev 24189)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">  * @return bool|string Returns true on success, or drop-in file to include.
</span><span class="cx">  */
</span><span class="cx"> function ms_site_check() {
</span><del>-       global $wpdb;
</del><ins>+        global $wpdb, $current_site;
</ins><span class="cx"> 
</span><span class="cx">  $blog = get_blog_details();
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>