<!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>[22118] trunk/wp-includes: Objects no longer need to be explicitly passed by ref to call_user_func*() to be callable.</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, #logmsg > ol { margin-left: 0; 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/22118">22118</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-10-04 20:00:16 +0000 (Thu, 04 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Objects no longer need to be explicitly passed by ref to call_user_func*() to be callable. Props wonderboymusic. fixes <a href="http://core.trac.wordpress.org/ticket/21865">#21865</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescachephp">trunk/wp-includes/cache.php</a></li>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
<li><a href="#trunkwpincludesclasshttpphp">trunk/wp-includes/class-http.php</a></li>
<li><a href="#trunkwpincludesclassoembedphp">trunk/wp-includes/class-oembed.php</a></li>
<li><a href="#trunkwpincludesclasswpwalkerphp">trunk/wp-includes/class-wp-walker.php</a></li>
<li><a href="#trunkwpincludesclasswpphp">trunk/wp-includes/class-wp.php</a></li>
<li><a href="#trunkwpincludesdefaultwidgetsphp">trunk/wp-includes/default-widgets.php</a></li>
<li><a href="#trunkwpincludesnavmenutemplatephp">trunk/wp-includes/nav-menu-template.php</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
<li><a href="#trunkwpincludeswidgetsphp">trunk/wp-includes/widgets.php</a></li>
<li><a href="#trunkwpincludeswpdbphp">trunk/wp-includes/wp-db.php</a></li>
<li><a href="#trunkwpincludeswpdiffphp">trunk/wp-includes/wp-diff.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescachephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/cache.php (22117 => 22118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/cache.php 2012-10-04 18:37:43 UTC (rev 22117)
+++ trunk/wp-includes/cache.php 2012-10-04 20:00:16 UTC (rev 22118)
</span><span class="lines">@@ -635,7 +635,7 @@
</span><span class="cx"> * @todo This should be moved to the PHP4 style constructor, PHP5
</span><span class="cx"> * already calls __destruct()
</span><span class="cx"> */
</span><del>- register_shutdown_function( array( &$this, '__destruct' ) );
</del><ins>+ register_shutdown_function( array( $this, '__destruct' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (22117 => 22118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2012-10-04 18:37:43 UTC (rev 22117)
+++ trunk/wp-includes/capabilities.php 2012-10-04 20:00:16 UTC (rev 22118)
</span><span class="lines">@@ -725,7 +725,7 @@
</span><span class="cx">
</span><span class="cx"> //Filter out caps that are not role names and assign to $this->roles
</span><span class="cx"> if ( is_array( $this->caps ) )
</span><del>- $this->roles = array_filter( array_keys( $this->caps ), array( &$wp_roles, 'is_role' ) );
</del><ins>+ $this->roles = array_filter( array_keys( $this->caps ), array( $wp_roles, 'is_role' ) );
</ins><span class="cx">
</span><span class="cx"> //Build $allcaps from role caps, overlay user's $caps
</span><span class="cx"> $this->allcaps = array();
</span><span class="lines">@@ -1331,7 +1331,7 @@
</span><span class="cx"> $args = array_slice( func_get_args(), 2 );
</span><span class="cx"> $args = array_merge( array( $capability ), $args );
</span><span class="cx">
</span><del>- return call_user_func_array( array( &$author, 'has_cap' ), $args );
</del><ins>+ return call_user_func_array( array( $author, 'has_cap' ), $args );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1353,7 +1353,7 @@
</span><span class="cx"> $args = array_slice( func_get_args(), 2 );
</span><span class="cx"> $args = array_merge( array( $capability ), $args );
</span><span class="cx">
</span><del>- return call_user_func_array( array( &$user, 'has_cap' ), $args );
</del><ins>+ return call_user_func_array( array( $user, 'has_cap' ), $args );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesclasshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-http.php (22117 => 22118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-http.php 2012-10-04 18:37:43 UTC (rev 22117)
+++ trunk/wp-includes/class-http.php 2012-10-04 20:00:16 UTC (rev 22118)
</span><span class="lines">@@ -1109,7 +1109,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( true === $r['blocking'] )
</span><del>- curl_setopt( $handle, CURLOPT_HEADERFUNCTION, array( &$this, 'stream_headers' ) );
</del><ins>+ curl_setopt( $handle, CURLOPT_HEADERFUNCTION, array( $this, 'stream_headers' ) );
</ins><span class="cx">
</span><span class="cx"> curl_setopt( $handle, CURLOPT_HEADER, false );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesclassoembedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-oembed.php (22117 => 22118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-oembed.php 2012-10-04 18:37:43 UTC (rev 22117)
+++ trunk/wp-includes/class-oembed.php 2012-10-04 20:00:16 UTC (rev 22118)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // Fix any embeds that contain new lines in the middle of the HTML which breaks wpautop().
</span><del>- add_filter( 'oembed_dataparse', array(&$this, '_strip_newlines'), 10, 3 );
</del><ins>+ add_filter( 'oembed_dataparse', array($this, '_strip_newlines'), 10, 3 );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesclasswpwalkerphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-walker.php (22117 => 22118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-walker.php 2012-10-04 18:37:43 UTC (rev 22117)
+++ trunk/wp-includes/class-wp-walker.php 2012-10-04 20:00:16 UTC (rev 22118)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> if ( is_array( $args[0] ) )
</span><span class="cx"> $args[0]['has_children'] = ! empty( $children_elements[$element->$id_field] );
</span><span class="cx"> $cb_args = array_merge( array(&$output, $element, $depth), $args);
</span><del>- call_user_func_array(array(&$this, 'start_el'), $cb_args);
</del><ins>+ call_user_func_array(array($this, 'start_el'), $cb_args);
</ins><span class="cx">
</span><span class="cx"> $id = $element->$id_field;
</span><span class="cx">
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> $newlevel = true;
</span><span class="cx"> //start the child delimiter
</span><span class="cx"> $cb_args = array_merge( array(&$output, $depth), $args);
</span><del>- call_user_func_array(array(&$this, 'start_lvl'), $cb_args);
</del><ins>+ call_user_func_array(array($this, 'start_lvl'), $cb_args);
</ins><span class="cx"> }
</span><span class="cx"> $this->display_element( $child, $children_elements, $max_depth, $depth + 1, $args, $output );
</span><span class="cx"> }
</span><span class="lines">@@ -149,12 +149,12 @@
</span><span class="cx"> if ( isset($newlevel) && $newlevel ){
</span><span class="cx"> //end the child delimiter
</span><span class="cx"> $cb_args = array_merge( array(&$output, $depth), $args);
</span><del>- call_user_func_array(array(&$this, 'end_lvl'), $cb_args);
</del><ins>+ call_user_func_array(array($this, 'end_lvl'), $cb_args);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> //end this element
</span><span class="cx"> $cb_args = array_merge( array(&$output, $element, $depth), $args);
</span><del>- call_user_func_array(array(&$this, 'end_el'), $cb_args);
</del><ins>+ call_user_func_array(array($this, 'end_el'), $cb_args);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesclasswpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp.php (22117 => 22118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp.php 2012-10-04 18:37:43 UTC (rev 22117)
+++ trunk/wp-includes/class-wp.php 2012-10-04 20:00:16 UTC (rev 22118)
</span><span class="lines">@@ -606,7 +606,7 @@
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function _map() {
</span><del>- $callback = array(&$this, 'callback');
</del><ins>+ $callback = array($this, 'callback');
</ins><span class="cx"> return preg_replace_callback($this->_pattern, $callback, $this->_subject);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesdefaultwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-widgets.php (22117 => 22118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-widgets.php 2012-10-04 18:37:43 UTC (rev 22117)
+++ trunk/wp-includes/default-widgets.php 2012-10-04 20:00:16 UTC (rev 22118)
</span><span class="lines">@@ -536,9 +536,9 @@
</span><span class="cx"> parent::__construct('recent-posts', __('Recent Posts'), $widget_ops);
</span><span class="cx"> $this->alt_option_name = 'widget_recent_entries';
</span><span class="cx">
</span><del>- add_action( 'save_post', array(&$this, 'flush_widget_cache') );
- add_action( 'deleted_post', array(&$this, 'flush_widget_cache') );
- add_action( 'switch_theme', array(&$this, 'flush_widget_cache') );
</del><ins>+ add_action( 'save_post', array($this, 'flush_widget_cache') );
+ add_action( 'deleted_post', array($this, 'flush_widget_cache') );
+ add_action( 'switch_theme', array($this, 'flush_widget_cache') );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function widget($args, $instance) {
</span><span class="lines">@@ -637,10 +637,10 @@
</span><span class="cx"> $this->alt_option_name = 'widget_recent_comments';
</span><span class="cx">
</span><span class="cx"> if ( is_active_widget(false, false, $this->id_base) )
</span><del>- add_action( 'wp_head', array(&$this, 'recent_comments_style') );
</del><ins>+ add_action( 'wp_head', array($this, 'recent_comments_style') );
</ins><span class="cx">
</span><del>- add_action( 'comment_post', array(&$this, 'flush_widget_cache') );
- add_action( 'transition_comment_status', array(&$this, 'flush_widget_cache') );
</del><ins>+ add_action( 'comment_post', array($this, 'flush_widget_cache') );
+ add_action( 'transition_comment_status', array($this, 'flush_widget_cache') );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function recent_comments_style() {
</span></span></pre></div>
<a id="trunkwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu-template.php (22117 => 22118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php 2012-10-04 18:37:43 UTC (rev 22117)
+++ trunk/wp-includes/nav-menu-template.php 2012-10-04 20:00:16 UTC (rev 22118)
</span><span class="lines">@@ -475,7 +475,7 @@
</span><span class="cx"> $walker = ( empty($r->walker) ) ? new Walker_Nav_Menu : $r->walker;
</span><span class="cx"> $args = array( $items, $depth, $r );
</span><span class="cx">
</span><del>- return call_user_func_array( array(&$walker, 'walk'), $args );
</del><ins>+ return call_user_func_array( array($walker, 'walk'), $args );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (22117 => 22118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2012-10-04 18:37:43 UTC (rev 22117)
+++ trunk/wp-includes/post-template.php 2012-10-04 20:00:16 UTC (rev 22118)
</span><span class="lines">@@ -937,7 +937,7 @@
</span><span class="cx"> $walker = $r['walker'];
</span><span class="cx">
</span><span class="cx"> $args = array($pages, $depth, $r, $current_page);
</span><del>- return call_user_func_array(array(&$walker, 'walk'), $args);
</del><ins>+ return call_user_func_array(array($walker, 'walk'), $args);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -954,7 +954,7 @@
</span><span class="cx"> else
</span><span class="cx"> $walker = $args[2]['walker'];
</span><span class="cx">
</span><del>- return call_user_func_array(array(&$walker, 'walk'), $args);
</del><ins>+ return call_user_func_array(array($walker, 'walk'), $args);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (22117 => 22118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2012-10-04 18:37:43 UTC (rev 22117)
+++ trunk/wp-includes/taxonomy.php 2012-10-04 20:00:16 UTC (rev 22118)
</span><span class="lines">@@ -1410,7 +1410,7 @@
</span><span class="cx"> if ( $child_of ) {
</span><span class="cx"> $children = _get_term_hierarchy($taxonomies[0]);
</span><span class="cx"> if ( ! empty($children) )
</span><del>- $terms = & _get_term_children($child_of, $terms, $taxonomies[0]);
</del><ins>+ $terms = _get_term_children($child_of, $terms, $taxonomies[0]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Update term counts to include children.
</span></span></pre></div>
<a id="trunkwpincludeswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/widgets.php (22117 => 22118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/widgets.php 2012-10-04 18:37:43 UTC (rev 22117)
+++ trunk/wp-includes/widgets.php 2012-10-04 20:00:16 UTC (rev 22118)
</span><span class="lines">@@ -152,15 +152,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function _get_display_callback() {
</span><del>- return array(&$this, 'display_callback');
</del><ins>+ return array($this, 'display_callback');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function _get_update_callback() {
</span><del>- return array(&$this, 'update_callback');
</del><ins>+ return array($this, 'update_callback');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function _get_form_callback() {
</span><del>- return array(&$this, 'form_callback');
</del><ins>+ return array($this, 'form_callback');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** Generate the actual widget content.
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx"> var $widgets = array();
</span><span class="cx">
</span><span class="cx"> function WP_Widget_Factory() {
</span><del>- add_action( 'widgets_init', array( &$this, '_register_widgets' ), 100 );
</del><ins>+ add_action( 'widgets_init', array( $this, '_register_widgets' ), 100 );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function register($widget_class) {
</span></span></pre></div>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (22117 => 22118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2012-10-04 18:37:43 UTC (rev 22117)
+++ trunk/wp-includes/wp-db.php 2012-10-04 20:00:16 UTC (rev 22118)
</span><span class="lines">@@ -534,7 +534,7 @@
</span><span class="cx"> * @param string $dbhost MySQL database host
</span><span class="cx"> */
</span><span class="cx"> function __construct( $dbuser, $dbpassword, $dbname, $dbhost ) {
</span><del>- register_shutdown_function( array( &$this, '__destruct' ) );
</del><ins>+ register_shutdown_function( array( $this, '__destruct' ) );
</ins><span class="cx">
</span><span class="cx"> if ( WP_DEBUG )
</span><span class="cx"> $this->show_errors();
</span><span class="lines">@@ -1000,7 +1000,7 @@
</span><span class="cx"> $query = str_replace( '"%s"', '%s', $query ); // doublequote unquoting
</span><span class="cx"> $query = str_replace( '%f' , '%F', $query ); // Force floats to be locale unaware
</span><span class="cx"> $query = preg_replace( '|(?<!%)%s|', "'%s'", $query ); // quote the strings, avoiding escaped strings like %%s
</span><del>- array_walk( $args, array( &$this, 'escape_by_ref' ) );
</del><ins>+ array_walk( $args, array( $this, 'escape_by_ref' ) );
</ins><span class="cx"> return @vsprintf( $query, $args );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludeswpdiffphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-diff.php (22117 => 22118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-diff.php 2012-10-04 18:37:43 UTC (rev 22117)
+++ trunk/wp-includes/wp-diff.php 2012-10-04 20:00:16 UTC (rev 22118)
</span><span class="lines">@@ -422,7 +422,7 @@
</span><span class="cx"> $chars2 = count_chars($string2);
</span><span class="cx">
</span><span class="cx"> // L1-norm of difference vector.
</span><del>- $difference = array_sum( array_map( array(&$this, 'difference'), $chars1, $chars2 ) );
</del><ins>+ $difference = array_sum( array_map( array($this, 'difference'), $chars1, $chars2 ) );
</ins><span class="cx">
</span><span class="cx"> // $string1 has zero length? Odd. Give huge penalty by not dividing.
</span><span class="cx"> if ( !$string1 )
</span></span></pre>
</div>
</div>
</body>
</html>