<!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>[31829] trunk/src: Replace `array_shift()` with `reset()` where appropriate for performance.</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/31829">31829</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/31829","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>2015-03-19 03:55:39 +0000 (Thu, 19 Mar 2015)</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'>Replace `array_shift()` with `reset()` where appropriate for performance.
Props SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/31259">#31259</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpupgraderphp">trunk/src/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpadminincludesmenuphp">trunk/src/wp-admin/includes/menu.php</a></li>
<li><a href="#trunksrcwpadminincludesmsphp">trunk/src/wp-admin/includes/ms.php</a></li>
<li><a href="#trunksrcwpadminincludesplugininstallphp">trunk/src/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminusereditphp">trunk/src/wp-admin/user-edit.php</a></li>
<li><a href="#trunksrcwpadminwidgetsphp">trunk/src/wp-admin/widgets.php</a></li>
<li><a href="#trunksrcwpincludespomostreamsphp">trunk/src/wp-includes/pomo/streams.php</a></li>
<li><a href="#trunksrcwpincludespostformatsphp">trunk/src/wp-includes/post-formats.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunksrcwpincludesqueryphp">trunk/src/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></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/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2015-03-19 02:25:05 UTC (rev 31828)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2015-03-19 03:55:39 UTC (rev 31829)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1091,7 +1091,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"> $_menu_items = array_map( 'wp_setup_nav_menu_item', array( $_object ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_menu_item = array_shift( $_menu_items );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_menu_item = reset( $_menu_items );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Restore the missing menu item properties
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_data['menu-item-description'] = $_menu_item->description;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1793,7 +1793,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$multi_number )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( $error );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_POST['widget-' . $id_base] = array( $multi_number => array_shift($settings) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_POST[ 'widget-' . $id_base ] = array( $multi_number => reset( $settings ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget_id = $id_base . '-' . $multi_number;
</span><span class="cx" style="display: block; padding: 0 10px"> $sidebar[] = $widget_id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpupgraderphp"></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/class-wp-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-upgrader.php 2015-03-19 02:25:05 UTC (rev 31828)
+++ trunk/src/wp-admin/includes/class-wp-upgrader.php 2015-03-19 03:55:39 UTC (rev 31829)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1904,7 +1904,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'plugin':
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_data = get_plugins( '/' . $update->slug );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $plugin_data = array_shift( $plugin_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $plugin_data = reset( $plugin_data );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $plugin_data )
</span><span class="cx" style="display: block; padding: 0 10px"> return $plugin_data['Name'];
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span></span></pre></div>
<a id="trunksrcwpadminincludesmediaphp"></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/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/media.php 2015-03-19 02:25:05 UTC (rev 31828)
+++ trunk/src/wp-admin/includes/media.php 2015-03-19 03:55:39 UTC (rev 31829)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -621,8 +621,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $errors = null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset($_POST['send']) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $keys = array_keys($_POST['send']);
- $send_id = (int) array_shift($keys);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $keys = array_keys( $_POST['send'] );
+ $send_id = (int) reset( $keys );
</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"> if ( !empty($_POST['attachments']) ) foreach ( $_POST['attachments'] as $attachment_id => $attachment ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1357,7 +1357,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_mime_types = get_post_mime_types();
</span><span class="cx" style="display: block; padding: 0 10px"> $keys = array_keys( wp_match_mime_types( array_keys( $post_mime_types ), $post->post_mime_type ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $type = array_shift( $keys );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $type = reset( $keys );
</ins><span class="cx" style="display: block; padding: 0 10px"> $type_html = "<input type='hidden' id='type-of-$attachment_id' value='" . esc_attr( $type ) . "' />";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $form_fields = get_attachment_fields_to_edit( $post, $r['errors'] );
</span></span></pre></div>
<a id="trunksrcwpadminincludesmenuphp"></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/menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/menu.php 2015-03-19 02:25:05 UTC (rev 31828)
+++ trunk/src/wp-admin/includes/menu.php 2015-03-19 03:55:39 UTC (rev 31829)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty($submenu[$data[2]]) )
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> $subs = $submenu[$data[2]];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $first_sub = array_shift($subs);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $first_sub = reset( $subs );
</ins><span class="cx" style="display: block; padding: 0 10px"> $old_parent = $data[2];
</span><span class="cx" style="display: block; padding: 0 10px"> $new_parent = $first_sub[2];
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +163,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $submenu[$data[2]] ) && 1 == count ( $submenu[$data[2]] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $subs = $submenu[$data[2]];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $first_sub = array_shift($subs);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $first_sub = reset( $subs );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $data[2] == $first_sub[2] )
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $submenu[$data[2]] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesmsphp"></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/ms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ms.php 2015-03-19 02:25:05 UTC (rev 31828)
+++ trunk/src/wp-admin/includes/ms.php 2015-03-19 03:55:39 UTC (rev 31829)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -804,11 +804,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$found ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = array_shift( $all_blogs );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = reset( $all_blogs );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( count( $all_blogs ) == 1 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog = array_shift( $all_blogs );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = reset( $all_blogs );
</ins><span class="cx" style="display: block; padding: 0 10px"> echo $blog->domain;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $primary_blog != $blog->userblog_id ) // Set the primary blog again if it's out of sync with blog list.
</span><span class="cx" style="display: block; padding: 0 10px"> update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
</span></span></pre></div>
<a id="trunksrcwpadminincludesplugininstallphp"></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/plugin-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin-install.php 2015-03-19 02:25:05 UTC (rev 31828)
+++ trunk/src/wp-admin/includes/plugin-install.php 2015-03-19 03:55:39 UTC (rev 31829)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -304,7 +304,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug);
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $key = array_keys( $installed_plugin );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $key = array_shift( $key ); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = reset( $key ); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers
</ins><span class="cx" style="display: block; padding: 0 10px"> $update_file = $api->slug . '/' . $key;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '=') ){
</span><span class="cx" style="display: block; padding: 0 10px"> $status = 'latest_installed';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -391,7 +391,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $section = isset( $_REQUEST['section'] ) ? wp_unslash( $_REQUEST['section'] ) : 'description'; // Default to the Description tab, Do not translate, API returns English.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $section ) || ! isset( $api->sections[ $section ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $section_titles = array_keys( (array) $api->sections );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $section = array_shift( $section_titles );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $section = reset( $section_titles );
</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"> iframe_header( __( 'Plugin Install' ) );
</span></span></pre></div>
<a id="trunksrcwpadminusereditphp"></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/user-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-edit.php 2015-03-19 02:25:05 UTC (rev 31828)
+++ trunk/src/wp-admin/user-edit.php 2015-03-19 03:55:39 UTC (rev 31829)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -315,7 +315,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // Compare user role against currently editable roles
</span><span class="cx" style="display: block; padding: 0 10px"> $user_roles = array_intersect( array_values( $profileuser->roles ), array_keys( get_editable_roles() ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$user_role = array_shift( $user_roles );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$user_role = reset( $user_roles );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // print the full list of roles with the primary one selected.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_dropdown_roles($user_role);
</span></span></pre></div>
<a id="trunksrcwpadminwidgetsphp"></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/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/widgets.php 2015-03-19 02:25:05 UTC (rev 31828)
+++ trunk/src/wp-admin/widgets.php 2015-03-19 03:55:39 UTC (rev 31829)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +189,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset($_GET['addnew']) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Default to the first sidebar
</span><span class="cx" style="display: block; padding: 0 10px"> $keys = array_keys( $wp_registered_sidebars );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sidebar = array_shift( $keys );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sidebar = reset( $keys );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset($_GET['base']) && isset($_GET['num']) ) { // multi-widget
</span><span class="cx" style="display: block; padding: 0 10px"> // Copy minimal info from an existing instance of this widget to a new instance
</span></span></pre></div>
<a id="trunksrcwpincludespomostreamsphp"></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/pomo/streams.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pomo/streams.php 2015-03-19 02:25:05 UTC (rev 31828)
+++ trunk/src/wp-includes/pomo/streams.php 2015-03-19 03:55:39 UTC (rev 31829)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,7 +40,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> $endian_letter = ('big' == $this->endian)? 'N' : 'V';
</span><span class="cx" style="display: block; padding: 0 10px"> $int = unpack($endian_letter, $bytes);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return array_shift($int);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return reset( $int );
</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="trunksrcwpincludespostformatsphp"></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-formats.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post-formats.php 2015-03-19 02:25:05 UTC (rev 31828)
+++ trunk/src/wp-includes/post-formats.php 2015-03-19 03:55:39 UTC (rev 31829)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_format ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $format = array_shift( $_format );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $format = reset( $_format );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return str_replace('post-format-', '', $format->slug );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2015-03-19 02:25:05 UTC (rev 31828)
+++ trunk/src/wp-includes/post.php 2015-03-19 03:55:39 UTC (rev 31829)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4599,7 +4599,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"> if ( 1 == count( $post_status ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where_post_type = $wpdb->prepare( "post_type = %s AND post_status = %s", $r['post_type'], array_shift( $post_status ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where_post_type = $wpdb->prepare( "post_type = %s AND post_status = %s", $r['post_type'], reset( $post_status ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_status = implode( "', '", $post_status );
</span><span class="cx" style="display: block; padding: 0 10px"> $where_post_type = $wpdb->prepare( "post_type = %s AND post_status IN ('$post_status')", $r['post_type'] );
</span></span></pre></div>
<a id="trunksrcwpincludesqueryphp"></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/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/query.php 2015-03-19 02:25:05 UTC (rev 31828)
+++ trunk/src/wp-includes/query.php 2015-03-19 03:55:39 UTC (rev 31829)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4673,7 +4673,7 @@
</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"> if ( count( $post_type ) > 1 )
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_type = array_shift( $post_type );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_type = reset( $post_type );
</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"> // Do not attempt redirect for hierarchical post types
</span></span></pre>
</div>
</div>
</body>
</html>