<!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>[30982] trunk/src: For clarity, initialize some arrays that previously were only assigned via short circuit in loops.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/30982">30982</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/30982","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-12-20 22:46:53 +0000 (Sat, 20 Dec 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>For clarity, initialize some arrays that previously were only assigned via short circuit in loops.
See <a href="https://core.trac.wordpress.org/ticket/30799">#30799</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesnavmenuphp">trunk/src/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.php</a></li>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpincludescategorytemplatephp">trunk/src/wp-includes/category-template.php</a></li>
<li><a href="#trunksrcwpincludesdefaultwidgetsphp">trunk/src/wp-includes/default-widgets.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunksrcwpincludesmsdeprecatedphp">trunk/src/wp-includes/ms-deprecated.php</a></li>
<li><a href="#trunksrcwpincludesmsloadphp">trunk/src/wp-includes/ms-load.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunksrcwpincludesrewritephp">trunk/src/wp-includes/rewrite.php</a></li>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/nav-menu.php 2014-12-20 22:18:12 UTC (rev 30981)
+++ trunk/src/wp-admin/includes/nav-menu.php 2014-12-20 22:46:53 UTC (rev 30982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1252,7 +1252,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_nav_menu_update_menu_items ( $nav_menu_selected_id, $nav_menu_selected_title ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $unsorted_menu_items = wp_get_nav_menu_items( $nav_menu_selected_id, array( 'orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID', 'post_status' => 'draft,publish' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $messages = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu_items = array();
</span><span class="cx" style="display: block; padding: 0 10px"> // Index menu items by db ID
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $unsorted_menu_items as $_item )
</span></span></pre></div>
<a id="trunksrcwpadminincludestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/template.php 2014-12-20 22:18:12 UTC (rev 30981)
+++ trunk/src/wp-admin/includes/template.php 2014-12-20 22:46:53 UTC (rev 30982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,11 +301,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_link_category_checklist( $link_id = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $default = 1;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $checked_categories = array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $link_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $checked_categories = wp_get_link_cats( $link_id );
</span><span class="cx" style="display: block; padding: 0 10px"> // No selected categories, strange
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! count( $checked_categories ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! count( $checked_categories ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $checked_categories[] = $default;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $checked_categories[] = $default;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/theme.php 2014-12-20 22:18:12 UTC (rev 30981)
+++ trunk/src/wp-admin/includes/theme.php 2014-12-20 22:46:53 UTC (rev 30982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -430,6 +430,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> WP_Theme::sort_by_name( $themes );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $parents = array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $themes as $theme ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $slug = $theme->get_stylesheet();
</span><span class="cx" style="display: block; padding: 0 10px"> $encoded_slug = urlencode( $slug );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -469,7 +472,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove 'delete' action if theme has an active child
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $parents ) && array_key_exists( $current_theme, $parents ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $parents ) && array_key_exists( $current_theme, $parents ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $prepared_themes[ $parents[ $current_theme ] ]['actions']['delete'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesupgradephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/upgrade.php 2014-12-20 22:18:12 UTC (rev 30981)
+++ trunk/src/wp-admin/includes/upgrade.php 2014-12-20 22:46:53 UTC (rev 30982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1786,7 +1786,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ($tableindices) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Clear the index array.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset($index_ary);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $index_ary = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // For every index in the table.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ($tableindices as $tableindex) {
</span></span></pre></div>
<a id="trunksrcwpincludescategorytemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/category-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/category-template.php 2014-12-20 22:18:12 UTC (rev 30981)
+++ trunk/src/wp-includes/category-template.php 2014-12-20 22:46:53 UTC (rev 30982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1289,11 +1289,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $terms ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $links = array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $terms as $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $link = get_term_link( $term, $taxonomy );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_wp_error( $link ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_wp_error( $link ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $link;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_links[] = '<a href="' . esc_url( $link ) . '" rel="tag">' . $term->name . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ $links[] = '<a href="' . esc_url( $link ) . '" rel="tag">' . $term->name . '</a>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1304,9 +1307,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $term_links An array of term links.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $links An array of term links.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_links = apply_filters( "term_links-$taxonomy", $term_links );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_links = apply_filters( "term_links-$taxonomy", $links );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $before . join( $sep, $term_links ) . $after;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesdefaultwidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/default-widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-widgets.php 2014-12-20 22:18:12 UTC (rev 30981)
+++ trunk/src/wp-includes/default-widgets.php 2014-12-20 22:46:53 UTC (rev 30982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1266,6 +1266,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function update( $new_instance, $old_instance ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> $instance['title'] = strip_tags(stripslashes($new_instance['title']));
</span><span class="cx" style="display: block; padding: 0 10px"> $instance['taxonomy'] = stripslashes($new_instance['taxonomy']);
</span><span class="cx" style="display: block; padding: 0 10px"> return $instance;
</span></span></pre></div>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2014-12-20 22:18:12 UTC (rev 30981)
+++ trunk/src/wp-includes/formatting.php 2014-12-20 22:46:53 UTC (rev 30982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1022,6 +1022,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $string = strtr($string, $chars);
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $chars = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> // Assume ISO-8859-1 if not UTF-8
</span><span class="cx" style="display: block; padding: 0 10px"> $chars['in'] = chr(128).chr(131).chr(138).chr(142).chr(154).chr(158)
</span><span class="cx" style="display: block; padding: 0 10px"> .chr(159).chr(162).chr(165).chr(181).chr(192).chr(193).chr(194)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1037,6 +1038,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $chars['out'] = "EfSZszYcYuAAAAAACEEEEIIIINOOOOOOUUUUYaaaaaaceeeeiiiinoooooouuuuyy";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $string = strtr($string, $chars['in'], $chars['out']);
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $double_chars = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> $double_chars['in'] = array(chr(140), chr(156), chr(198), chr(208), chr(222), chr(223), chr(230), chr(240), chr(254));
</span><span class="cx" style="display: block; padding: 0 10px"> $double_chars['out'] = array('OE', 'oe', 'AE', 'DH', 'TH', 'ss', 'ae', 'dh', 'th');
</span><span class="cx" style="display: block; padding: 0 10px"> $string = str_replace($double_chars['in'], $double_chars['out'], $string);
</span></span></pre></div>
<a id="trunksrcwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/general-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/general-template.php 2014-12-20 22:18:12 UTC (rev 30981)
+++ trunk/src/wp-includes/general-template.php 2014-12-20 22:46:53 UTC (rev 30982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1438,7 +1438,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $key = "wp_get_archives:$key:$last_changed";
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $results = $wpdb->get_results( $query );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cache[ $key ] = $results;
</del><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( $key, $results, 'posts' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $results ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1657,6 +1656,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tbody>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $daywithpost = array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Get days with posts
</span><span class="cx" style="display: block; padding: 0 10px"> $dayswithposts = $wpdb->get_results("SELECT DISTINCT DAYOFMONTH(post_date)
</span><span class="cx" style="display: block; padding: 0 10px"> FROM $wpdb->posts WHERE post_date >= '{$thisyear}-{$thismonth}-01 00:00:00'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1666,8 +1667,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $dayswithposts as $daywith ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $daywithpost[] = $daywith[0];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- $daywithpost = array();
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false || stripos($_SERVER['HTTP_USER_AGENT'], 'camino') !== false || stripos($_SERVER['HTTP_USER_AGENT'], 'safari') !== false)
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2014-12-20 22:18:12 UTC (rev 30981)
+++ trunk/src/wp-includes/media.php 2014-12-20 22:46:53 UTC (rev 30982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -586,6 +586,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // get the best one for a specified set of dimensions
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array($size) && !empty($imagedata['sizes']) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $areas = array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $imagedata['sizes'] as $_size => $data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // already cropped to width or height; so use this size
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( $data['width'] == $size[0] && $data['height'] <= $size[1] ) || ( $data['height'] == $size[1] && $data['width'] <= $size[0] ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesmsdeprecatedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-deprecated.php 2014-12-20 22:18:12 UTC (rev 30981)
+++ trunk/src/wp-includes/ms-deprecated.php 2014-12-20 22:46:53 UTC (rev 30982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,20 +166,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $blogs = $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' ORDER BY registered DESC", $wpdb->siteid), ARRAY_A );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_list = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $blogs as $details ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_list[ $details['blog_id'] ] = $details;
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_list[ $details['blog_id'] ]['postcount'] = $wpdb->get_var( "SELECT COUNT(ID) FROM " . $wpdb->get_blog_prefix( $details['blog_id'] ). "posts WHERE post_status='publish' AND post_type='post'" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $blogs );
- $blogs = $blog_list;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false == is_array( $blogs ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $blog_list ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $num == 'all' )
- return array_slice( $blogs, $start, count( $blogs ) );
- else
- return array_slice( $blogs, $start, $num );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $num == 'all' ) {
+ return array_slice( $blog_list, $start, count( $blog_list ) );
+ } else {
+ return array_slice( $blog_list, $start, $num );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesmsloadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-load.php 2014-12-20 22:18:12 UTC (rev 30981)
+++ trunk/src/wp-includes/ms-load.php 2014-12-20 22:46:53 UTC (rev 30982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,6 +308,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $path_segments = array_slice( $path_segments, 0, $segments );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $paths = array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> while ( count( $path_segments ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $paths[] = '/' . implode( '/', $path_segments ) . '/';
</span><span class="cx" style="display: block; padding: 0 10px"> array_pop( $path_segments );
</span></span></pre></div>
<a id="trunksrcwpincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php 2014-12-20 22:18:12 UTC (rev 30981)
+++ trunk/src/wp-includes/post.php 2014-12-20 22:46:53 UTC (rev 30982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,12 +352,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $output == OBJECT ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $kids;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $output == ARRAY_A ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( (array) $kids as $kid )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $weeuns = array();
+ foreach ( (array) $kids as $kid ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $weeuns[$kid->ID] = get_object_vars($kids[$kid->ID]);
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> return $weeuns;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $output == ARRAY_N ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( (array) $kids as $kid )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $babes = array();
+ foreach ( (array) $kids as $kid ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $babes[$kid->ID] = array_values(get_object_vars($kids[$kid->ID]));
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> return $babes;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return $kids;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1681,9 +1685,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !isset( $object->labels['all_items'] ) && isset( $object->labels['menu_name'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $object->labels['all_items'] = $object->labels['menu_name'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $nohier_vs_hier_defaults as $key => $value )
- $defaults[$key] = $object->hierarchical ? $value[1] : $value[0];
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $defaults = array();
+ foreach ( $nohier_vs_hier_defaults as $key => $value ) {
+ $defaults[$key] = $object->hierarchical ? $value[1] : $value[0];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $labels = array_merge( $defaults, $object->labels );
</span><span class="cx" style="display: block; padding: 0 10px"> return (object)$labels;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2510,6 +2515,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wildcards = array('', '%', '%/%');
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_string($post_mime_types) )
</span><span class="cx" style="display: block; padding: 0 10px"> $post_mime_types = array_map('trim', explode(',', $post_mime_types));
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $wheres = array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $post_mime_types as $mime_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $mime_type = preg_replace('/\s/', '', $mime_type);
</span><span class="cx" style="display: block; padding: 0 10px"> $slashpos = strpos($mime_type, '/');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5140,6 +5148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_add( 'icon_files', $icon_files, 'default', 600 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $types = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> // Icon basename - extension = MIME wildcard.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $icon_files as $file => $uri )
</span><span class="cx" style="display: block; padding: 0 10px"> $types[ preg_replace('/^([^.]*).*$/', '$1', basename($file)) ] =& $icon_files[$file];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5513,9 +5522,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array($post_type) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ptypes = $post_type;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'any' == $post_type ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ptypes = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> // Just use the post_types in the supplied posts.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $posts as $post )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $posts as $post ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ptypes[] = $post->post_type;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $ptypes = array_unique($ptypes);
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $ptypes = array($post_type);
</span></span></pre></div>
<a id="trunksrcwpincludesrewritephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rewrite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rewrite.php 2014-12-20 22:18:12 UTC (rev 30981)
+++ trunk/src/wp-includes/rewrite.php 2014-12-20 22:46:53 UTC (rev 30982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1288,6 +1288,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $trackbackindex = $index;
</span><span class="cx" style="display: block; padding: 0 10px"> //build a list from the rewritecode and queryreplace arrays, that will look something like
</span><span class="cx" style="display: block; padding: 0 10px"> //tagname=$matches[i] where i is the current $i
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $queries = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < $num_tokens; ++$i ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 < $i )
</span><span class="cx" style="display: block; padding: 0 10px"> $queries[$i] = $queries[$i - 1] . '&';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1328,7 +1329,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $num_toks = preg_match_all('/%.+?%/', $struct, $toks);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //get the 'tagname=$matches[i]'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query = ( isset($queries) && is_array($queries) && !empty($num_toks) ) ? $queries[$num_toks - 1] : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query = ( ! empty( $num_toks ) && isset( $queries[$num_toks - 1] ) ) ? $queries[$num_toks - 1] : '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //set up $ep_mask_specific which is used to match more specific URL types
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $dirs[$j] ) {
</span></span></pre></div>
<a id="trunksrcwpincludestaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2014-12-20 22:18:12 UTC (rev 30981)
+++ trunk/src/wp-includes/taxonomy.php 2014-12-20 22:46:53 UTC (rev 30982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3889,6 +3889,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term_items = array();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms_by_id = array();
+ $term_ids = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $terms as $key => $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $terms_by_id[$term->term_id] = & $terms[$key];
</span></span></pre></div>
<a id="trunksrcwpincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme.php 2014-12-20 22:18:12 UTC (rev 30981)
+++ trunk/src/wp-includes/theme.php 2014-12-20 22:46:53 UTC (rev 30982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -406,6 +406,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $found_themes = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_theme_directories = (array) $wp_theme_directories;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $relative_theme_roots = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set up maybe-relative, maybe-absolute array of theme directories.
</span><span class="cx" style="display: block; padding: 0 10px"> // We always want to return absolute, but we need to cache relative
</span></span></pre>
</div>
</div>
</body>
</html>