<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[15471] trunk: More curses on PHP 5.0.5.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15471">15471</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-07-25 07:35:59 +0000 (Sun, 25 Jul 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>More curses on PHP 5.0.5. see <a href="http://trac.wordpress.org/ticket/13757">#13757</a>, fixes <a href="http://trac.wordpress.org/ticket/14160">#14160</a>. for trunk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminincludesnavmenuphp">trunk/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunkwpadminmseditphp">trunk/wp-admin/ms-edit.php</a></li>
<li><a href="#trunkwpappphp">trunk/wp-app.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludeswpdbphp">trunk/wp-includes/wp-db.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (15470 => 15471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-07-25 07:34:49 UTC (rev 15470)
+++ trunk/wp-admin/admin-ajax.php 2010-07-25 07:35:59 UTC (rev 15471)
</span><span class="lines">@@ -893,7 +893,7 @@
</span><span class="cx"> 'supplemental' => array('postid' => $pid)
</span><span class="cx"> ) );
</span><span class="cx"> } else { // Update?
</span><del>- $mid = (int) array_pop(array_keys($_POST['meta']));
</del><ins>+ $mid = (int) array_pop( $var_by_ref = array_keys($_POST['meta']) );
</ins><span class="cx"> $key = $_POST['meta'][$mid]['key'];
</span><span class="cx"> $value = $_POST['meta'][$mid]['value'];
</span><span class="cx"> if ( '' == trim($key) )
</span></span></pre></div>
<a id="trunkwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/nav-menu.php (15470 => 15471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/nav-menu.php 2010-07-25 07:34:49 UTC (rev 15470)
+++ trunk/wp-admin/includes/nav-menu.php 2010-07-25 07:35:59 UTC (rev 15471)
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx"> while ( have_posts() ) {
</span><span class="cx"> the_post();
</span><span class="cx"> if ( 'markup' == $response_format ) {
</span><del>- echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( get_the_ID() ) ) ), 0, (object) $args );
</del><ins>+ echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $var_by_ref = get_the_ID() ) ) ), 0, (object) $args );
</ins><span class="cx"> } elseif ( 'json' == $response_format ) {
</span><span class="cx"> echo json_encode(
</span><span class="cx"> array(
</span></span></pre></div>
<a id="trunkwpadminmseditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-edit.php (15470 => 15471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php 2010-07-25 07:34:49 UTC (rev 15470)
+++ trunk/wp-admin/ms-edit.php 2010-07-25 07:35:59 UTC (rev 15471)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> $move_users = array();
</span><span class="cx"> foreach ( (array)$users as $user ) {
</span><span class="cx"> $user_meta_value = unserialize( $user->meta_value );
</span><del>- if ( is_array( $user_meta_value ) && array_pop( array_keys( $user_meta_value ) ) == 'subscriber' )
</del><ins>+ if ( is_array( $user_meta_value ) && array_pop( $var_by_ref = array_keys( $user_meta_value ) ) == 'subscriber' )
</ins><span class="cx"> $move_users[] = $user->user_id;
</span><span class="cx"> }
</span><span class="cx"> if ( false == empty( $move_users ) ) {
</span></span></pre></div>
<a id="trunkwpappphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-app.php (15470 => 15471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-app.php 2010-07-25 07:34:49 UTC (rev 15470)
+++ trunk/wp-app.php 2010-07-25 07:35:59 UTC (rev 15471)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> */
</span><span class="cx"> function AtomServer() {
</span><span class="cx">
</span><del>- $this->script_name = array_pop(explode('/',$_SERVER['SCRIPT_NAME']));
</del><ins>+ $this->script_name = array_pop( $var_by_ref = explode( '/', $_SERVER['SCRIPT_NAME'] ) );
</ins><span class="cx"> $this->app_base = site_url( $this->script_name . '/' );
</span><span class="cx">
</span><span class="cx"> $this->selectors = array(
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (15470 => 15471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-07-25 07:34:49 UTC (rev 15470)
+++ trunk/wp-includes/query.php 2010-07-25 07:35:59 UTC (rev 15471)
</span><span class="lines">@@ -2738,7 +2738,8 @@
</span><span class="cx"> $this->queried_object = $term;
</span><span class="cx"> $this->queried_object_id = $term->term_id;
</span><span class="cx"> } elseif ( $this->is_posts_page ) {
</span><del>- $this->queried_object = & get_page(get_option('page_for_posts'));
</del><ins>+ $page_for_posts = get_option('page_for_posts');
+ $this->queried_object = & get_page( $page_for_posts );
</ins><span class="cx"> $this->queried_object_id = (int) $this->queried_object->ID;
</span><span class="cx"> } elseif ( $this->is_single && !is_null($this->post) ) {
</span><span class="cx"> $this->queried_object = $this->post;
</span></span></pre></div>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (15470 => 15471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2010-07-25 07:34:49 UTC (rev 15470)
+++ trunk/wp-includes/wp-db.php 2010-07-25 07:35:59 UTC (rev 15471)
</span><span class="lines">@@ -1401,7 +1401,7 @@
</span><span class="cx"> // Return an array of row objects with keys from column 1
</span><span class="cx"> // (Duplicates are discarded)
</span><span class="cx"> foreach ( $this->last_result as $row ) {
</span><del>- $key = array_shift( get_object_vars( $row ) );
</del><ins>+ $key = array_shift( $var_by_ref = get_object_vars( $row ) );
</ins><span class="cx"> if ( ! isset( $new_array[ $key ] ) )
</span><span class="cx"> $new_array[ $key ] = $row;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>