<!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>[25254] trunk: Remove lingering instances of call time pass-by-reference, limited to instances of `callable` - use `$this` instead of `&$this`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25254">25254</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-09-05 16:33:50 +0000 (Thu, 05 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove lingering instances of call time pass-by-reference, limited to instances of `callable` - use `$this` instead of `&$this`.
Props jdgrimes.
See <a href="http://core.trac.wordpress.org/ticket/25160">#25160</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincustombackgroundphp">trunk/src/wp-admin/custom-background.php</a></li>
<li><a href="#trunksrcwpadmincustomheaderphp">trunk/src/wp-admin/custom-header.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpimporterphp">trunk/src/wp-admin/includes/class-wp-importer.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswplisttablephp">trunk/src/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppluginslisttablephp">trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpupgraderphp">trunk/src/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludeslisttablephp">trunk/src/wp-admin/includes/list-table.php</a></li>
<li><a href="#trunktestsphpunitincludesutilsphp">trunk/tests/phpunit/includes/utils.php</a></li>
<li><a href="#trunktestsphpunitincludeswpprofilerphp">trunk/tests/phpunit/includes/wp-profiler.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesThemephp">trunk/tests/phpunit/tests/admin/includesTheme.php</a></li>
<li><a href="#trunktestsphpunittestsfiltersphp">trunk/tests/phpunit/tests/filters.php</a></li>
<li><a href="#trunktestsphpunittestsmetaphp">trunk/tests/phpunit/tests/meta.php</a></li>
<li><a href="#trunktestsphpunitteststhemeWPThemephp">trunk/tests/phpunit/tests/theme/WPTheme.php</a></li>
<li><a href="#trunktestsphpunitteststhemethemeDirphp">trunk/tests/phpunit/tests/theme/themeDir.php</a></li>
<li><a href="#trunktestsphpunittestsusercapabilitiesphp">trunk/tests/phpunit/tests/user/capabilities.php</a></li>
<li><a href="#trunktoolsi18nmakepotphp">trunk/tools/i18n/makepot.php</a></li>
<li><a href="#trunktoolsi18nnotgettextedphp">trunk/tools/i18n/not-gettexted.php</a></li>
<li><a href="#trunktoolsi18npotextmetaphp">trunk/tools/i18n/pot-ext-meta.php</a></li>
<li><a href="#trunktoolsi18ntNotGettextedTestphp">trunk/tools/i18n/t/NotGettextedTest.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincustombackgroundphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/custom-background.php (25253 => 25254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/custom-background.php 2013-09-05 16:22:14 UTC (rev 25253)
+++ trunk/src/wp-admin/custom-background.php 2013-09-05 16:33:50 UTC (rev 25254)
</span><span class="lines">@@ -67,11 +67,11 @@
</span><span class="cx"> if ( ! current_user_can('edit_theme_options') )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- $this->page = $page = add_theme_page(__('Background'), __('Background'), 'edit_theme_options', 'custom-background', array(&$this, 'admin_page'));
</del><ins>+ $this->page = $page = add_theme_page(__('Background'), __('Background'), 'edit_theme_options', 'custom-background', array($this, 'admin_page'));
</ins><span class="cx">
</span><del>- add_action("load-$page", array(&$this, 'admin_load'));
- add_action("load-$page", array(&$this, 'take_action'), 49);
- add_action("load-$page", array(&$this, 'handle_upload'), 49);
</del><ins>+ add_action("load-$page", array($this, 'admin_load'));
+ add_action("load-$page", array($this, 'take_action'), 49);
+ add_action("load-$page", array($this, 'handle_upload'), 49);
</ins><span class="cx">
</span><span class="cx"> if ( $this->admin_header_callback )
</span><span class="cx"> add_action("admin_head-$page", $this->admin_header_callback, 51);
</span></span></pre></div>
<a id="trunksrcwpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/custom-header.php (25253 => 25254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/custom-header.php 2013-09-05 16:22:14 UTC (rev 25253)
+++ trunk/src/wp-admin/custom-header.php 2013-09-05 16:33:50 UTC (rev 25254)
</span><span class="lines">@@ -84,13 +84,13 @@
</span><span class="cx"> if ( ! current_user_can('edit_theme_options') )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- $this->page = $page = add_theme_page(__('Header'), __('Header'), 'edit_theme_options', 'custom-header', array(&$this, 'admin_page'));
</del><ins>+ $this->page = $page = add_theme_page(__('Header'), __('Header'), 'edit_theme_options', 'custom-header', array($this, 'admin_page'));
</ins><span class="cx">
</span><del>- add_action("admin_print_scripts-$page", array(&$this, 'js_includes'));
- add_action("admin_print_styles-$page", array(&$this, 'css_includes'));
- add_action("admin_head-$page", array(&$this, 'help') );
- add_action("admin_head-$page", array(&$this, 'take_action'), 50);
- add_action("admin_head-$page", array(&$this, 'js'), 50);
</del><ins>+ add_action("admin_print_scripts-$page", array($this, 'js_includes'));
+ add_action("admin_print_styles-$page", array($this, 'css_includes'));
+ add_action("admin_head-$page", array($this, 'help') );
+ add_action("admin_head-$page", array($this, 'take_action'), 50);
+ add_action("admin_head-$page", array($this, 'js'), 50);
</ins><span class="cx"> if ( $this->admin_header_callback )
</span><span class="cx"> add_action("admin_head-$page", $this->admin_header_callback, 51);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpimporterphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-importer.php (25253 => 25254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-importer.php 2013-09-05 16:22:14 UTC (rev 25253)
+++ trunk/src/wp-admin/includes/class-wp-importer.php 2013-09-05 16:33:50 UTC (rev 25254)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> */
</span><span class="cx"> function get_page( $url, $username = '', $password = '', $head = false ) {
</span><span class="cx"> // Increase the timeout
</span><del>- add_filter( 'http_request_timeout', array( &$this, 'bump_request_timeout' ) );
</del><ins>+ add_filter( 'http_request_timeout', array( $this, 'bump_request_timeout' ) );
</ins><span class="cx">
</span><span class="cx"> $headers = array();
</span><span class="cx"> $args = array();
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-list-table.php (25253 => 25254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-list-table.php 2013-09-05 16:22:14 UTC (rev 25253)
+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2013-09-05 16:33:50 UTC (rev 25254)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx">
</span><span class="cx"> $this->screen = convert_to_screen( $args['screen'] );
</span><span class="cx">
</span><del>- add_filter( "manage_{$this->screen->id}_columns", array( &$this, 'get_columns' ), 0 );
</del><ins>+ add_filter( "manage_{$this->screen->id}_columns", array( $this, 'get_columns' ), 0 );
</ins><span class="cx">
</span><span class="cx"> if ( !$args['plural'] )
</span><span class="cx"> $args['plural'] = $this->screen->base;
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx">
</span><span class="cx"> if ( $args['ajax'] ) {
</span><span class="cx"> // wp_enqueue_script( 'list-table' );
</span><del>- add_action( 'admin_footer', array( &$this, '_js_vars' ) );
</del><ins>+ add_action( 'admin_footer', array( $this, '_js_vars' ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -857,7 +857,7 @@
</span><span class="cx"> }
</span><span class="cx"> elseif ( method_exists( $this, 'column_' . $column_name ) ) {
</span><span class="cx"> echo "<td $attributes>";
</span><del>- echo call_user_func( array( &$this, 'column_' . $column_name ), $item );
</del><ins>+ echo call_user_func( array( $this, 'column_' . $column_name ), $item );
</ins><span class="cx"> echo "</td>";
</span><span class="cx"> }
</span><span class="cx"> else {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmsthemeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php (25253 => 25254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2013-09-05 16:22:14 UTC (rev 25253)
+++ trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2013-09-05 16:33:50 UTC (rev 25254)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> if ( $s ) {
</span><span class="cx"> $status = 'search';
</span><del>- $themes['search'] = array_filter( array_merge( $themes['all'], $themes['broken'] ), array( &$this, '_search_callback' ) );
</del><ins>+ $themes['search'] = array_filter( array_merge( $themes['all'], $themes['broken'] ), array( $this, '_search_callback' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $totals = array();
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> if ( 'ASC' == $order )
</span><span class="cx"> $this->items = array_reverse( $this->items );
</span><span class="cx"> } else {
</span><del>- uasort( $this->items, array( &$this, '_order_callback' ) );
</del><ins>+ uasort( $this->items, array( $this, '_order_callback' ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppluginslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-plugins-list-table.php (25253 => 25254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2013-09-05 16:22:14 UTC (rev 25253)
+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2013-09-05 16:33:50 UTC (rev 25254)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx">
</span><span class="cx"> if ( $s ) {
</span><span class="cx"> $status = 'search';
</span><del>- $plugins['search'] = array_filter( $plugins['all'], array( &$this, '_search_callback' ) );
</del><ins>+ $plugins['search'] = array_filter( $plugins['all'], array( $this, '_search_callback' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $totals = array();
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> $orderby = ucfirst( $orderby );
</span><span class="cx"> $order = strtoupper( $order );
</span><span class="cx">
</span><del>- uasort( $this->items, array( &$this, '_order_callback' ) );
</del><ins>+ uasort( $this->items, array( $this, '_order_callback' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $plugins_per_page = $this->get_items_per_page( str_replace( '-', '_', $screen->id . '_per_page' ), 999 );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-upgrader.php (25253 => 25254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-upgrader.php 2013-09-05 16:22:14 UTC (rev 25253)
+++ trunk/src/wp-admin/includes/class-wp-upgrader.php 2013-09-05 16:33:50 UTC (rev 25254)
</span><span class="lines">@@ -403,7 +403,7 @@
</span><span class="cx"> $this->init();
</span><span class="cx"> $this->install_strings();
</span><span class="cx">
</span><del>- add_filter('upgrader_source_selection', array(&$this, 'check_package') );
</del><ins>+ add_filter('upgrader_source_selection', array($this, 'check_package') );
</ins><span class="cx">
</span><span class="cx"> $this->run(array(
</span><span class="cx"> 'package' => $package,
</span><span class="lines">@@ -413,7 +413,7 @@
</span><span class="cx"> 'hook_extra' => array()
</span><span class="cx"> ));
</span><span class="cx">
</span><del>- remove_filter('upgrader_source_selection', array(&$this, 'check_package') );
</del><ins>+ remove_filter('upgrader_source_selection', array($this, 'check_package') );
</ins><span class="cx">
</span><span class="cx"> if ( ! $this->result || is_wp_error($this->result) )
</span><span class="cx"> return $this->result;
</span><span class="lines">@@ -443,9 +443,9 @@
</span><span class="cx"> // Get the URL to the zip file
</span><span class="cx"> $r = $current->response[ $plugin ];
</span><span class="cx">
</span><del>- add_filter('upgrader_pre_install', array(&$this, 'deactivate_plugin_before_upgrade'), 10, 2);
- add_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'), 10, 4);
- //'source_selection' => array(&$this, 'source_selection'), //there's a trac ticket to move up the directory for zip's which are made a bit differently, useful for non-.org plugins.
</del><ins>+ add_filter('upgrader_pre_install', array($this, 'deactivate_plugin_before_upgrade'), 10, 2);
+ add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4);
+ //'source_selection' => array($this, 'source_selection'), //there's a trac ticket to move up the directory for zip's which are made a bit differently, useful for non-.org plugins.
</ins><span class="cx">
</span><span class="cx"> $this->run(array(
</span><span class="cx"> 'package' => $r->package,
</span><span class="lines">@@ -458,8 +458,8 @@
</span><span class="cx"> ));
</span><span class="cx">
</span><span class="cx"> // Cleanup our hooks, in case something else does a upgrade on this connection.
</span><del>- remove_filter('upgrader_pre_install', array(&$this, 'deactivate_plugin_before_upgrade'));
- remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'));
</del><ins>+ remove_filter('upgrader_pre_install', array($this, 'deactivate_plugin_before_upgrade'));
+ remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'));
</ins><span class="cx">
</span><span class="cx"> if ( ! $this->result || is_wp_error($this->result) )
</span><span class="cx"> return $this->result;
</span><span class="lines">@@ -480,7 +480,7 @@
</span><span class="cx">
</span><span class="cx"> $current = get_site_transient( 'update_plugins' );
</span><span class="cx">
</span><del>- add_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'), 10, 4);
</del><ins>+ add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4);
</ins><span class="cx">
</span><span class="cx"> $this->skin->header();
</span><span class="cx">
</span><span class="lines">@@ -550,7 +550,7 @@
</span><span class="cx"> $this->skin->footer();
</span><span class="cx">
</span><span class="cx"> // Cleanup our hooks, in case something else does a upgrade on this connection.
</span><del>- remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'));
</del><ins>+ remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'));
</ins><span class="cx">
</span><span class="cx"> // Force refresh of plugin update information
</span><span class="cx"> delete_site_transient('update_plugins');
</span><span class="lines">@@ -712,7 +712,7 @@
</span><span class="cx"> if ( ! $api || is_wp_error($api) ) {
</span><span class="cx"> $this->skin->feedback( 'parent_theme_not_found', $theme_info->get('Template') );
</span><span class="cx"> // Don't show activate or preview actions after install
</span><del>- add_filter('install_theme_complete_actions', array(&$this, 'hide_activate_preview_actions') );
</del><ins>+ add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions') );
</ins><span class="cx"> return $install_result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -737,7 +737,7 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> if ( is_wp_error($parent_result) )
</span><del>- add_filter('install_theme_complete_actions', array(&$this, 'hide_activate_preview_actions') );
</del><ins>+ add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions') );
</ins><span class="cx">
</span><span class="cx"> // Start cleaning up after the parents installation
</span><span class="cx"> remove_filter('install_theme_complete_actions', '__return_false', 999);
</span><span class="lines">@@ -760,8 +760,8 @@
</span><span class="cx"> $this->init();
</span><span class="cx"> $this->install_strings();
</span><span class="cx">
</span><del>- add_filter('upgrader_source_selection', array(&$this, 'check_package') );
- add_filter('upgrader_post_install', array(&$this, 'check_parent_theme_filter'), 10, 3);
</del><ins>+ add_filter('upgrader_source_selection', array($this, 'check_package') );
+ add_filter('upgrader_post_install', array($this, 'check_parent_theme_filter'), 10, 3);
</ins><span class="cx">
</span><span class="cx"> $options = array(
</span><span class="cx"> 'package' => $package,
</span><span class="lines">@@ -772,8 +772,8 @@
</span><span class="cx">
</span><span class="cx"> $this->run($options);
</span><span class="cx">
</span><del>- remove_filter('upgrader_source_selection', array(&$this, 'check_package') );
- remove_filter('upgrader_post_install', array(&$this, 'check_parent_theme_filter'));
</del><ins>+ remove_filter('upgrader_source_selection', array($this, 'check_package') );
+ remove_filter('upgrader_post_install', array($this, 'check_parent_theme_filter'));
</ins><span class="cx">
</span><span class="cx"> if ( ! $this->result || is_wp_error($this->result) )
</span><span class="cx"> return $this->result;
</span><span class="lines">@@ -802,9 +802,9 @@
</span><span class="cx">
</span><span class="cx"> $r = $current->response[ $theme ];
</span><span class="cx">
</span><del>- add_filter('upgrader_pre_install', array(&$this, 'current_before'), 10, 2);
- add_filter('upgrader_post_install', array(&$this, 'current_after'), 10, 2);
- add_filter('upgrader_clear_destination', array(&$this, 'delete_old_theme'), 10, 4);
</del><ins>+ add_filter('upgrader_pre_install', array($this, 'current_before'), 10, 2);
+ add_filter('upgrader_post_install', array($this, 'current_after'), 10, 2);
+ add_filter('upgrader_clear_destination', array($this, 'delete_old_theme'), 10, 4);
</ins><span class="cx">
</span><span class="cx"> $options = array(
</span><span class="cx"> 'package' => $r['package'],
</span><span class="lines">@@ -818,9 +818,9 @@
</span><span class="cx">
</span><span class="cx"> $this->run($options);
</span><span class="cx">
</span><del>- remove_filter('upgrader_pre_install', array(&$this, 'current_before'));
- remove_filter('upgrader_post_install', array(&$this, 'current_after'));
- remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_theme'));
</del><ins>+ remove_filter('upgrader_pre_install', array($this, 'current_before'));
+ remove_filter('upgrader_post_install', array($this, 'current_after'));
+ remove_filter('upgrader_clear_destination', array($this, 'delete_old_theme'));
</ins><span class="cx">
</span><span class="cx"> if ( ! $this->result || is_wp_error($this->result) )
</span><span class="cx"> return $this->result;
</span><span class="lines">@@ -840,9 +840,9 @@
</span><span class="cx">
</span><span class="cx"> $current = get_site_transient( 'update_themes' );
</span><span class="cx">
</span><del>- add_filter('upgrader_pre_install', array(&$this, 'current_before'), 10, 2);
- add_filter('upgrader_post_install', array(&$this, 'current_after'), 10, 2);
- add_filter('upgrader_clear_destination', array(&$this, 'delete_old_theme'), 10, 4);
</del><ins>+ add_filter('upgrader_pre_install', array($this, 'current_before'), 10, 2);
+ add_filter('upgrader_post_install', array($this, 'current_after'), 10, 2);
+ add_filter('upgrader_clear_destination', array($this, 'delete_old_theme'), 10, 4);
</ins><span class="cx">
</span><span class="cx"> $this->skin->header();
</span><span class="cx">
</span><span class="lines">@@ -912,9 +912,9 @@
</span><span class="cx"> $this->skin->footer();
</span><span class="cx">
</span><span class="cx"> // Cleanup our hooks, in case something else does a upgrade on this connection.
</span><del>- remove_filter('upgrader_pre_install', array(&$this, 'current_before'));
- remove_filter('upgrader_post_install', array(&$this, 'current_after'));
- remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_theme'));
</del><ins>+ remove_filter('upgrader_pre_install', array($this, 'current_before'));
+ remove_filter('upgrader_post_install', array($this, 'current_after'));
+ remove_filter('upgrader_clear_destination', array($this, 'delete_old_theme'));
</ins><span class="cx">
</span><span class="cx"> // Force refresh of theme update information
</span><span class="cx"> wp_clean_themes_cache();
</span></span></pre></div>
<a id="trunksrcwpadminincludeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/list-table.php (25253 => 25254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/list-table.php 2013-09-05 16:22:14 UTC (rev 25253)
+++ trunk/src/wp-admin/includes/list-table.php 2013-09-05 16:33:50 UTC (rev 25254)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !empty( $columns ) ) {
</span><span class="cx"> $this->_columns = $columns;
</span><del>- add_filter( 'manage_' . $screen->id . '_columns', array( &$this, 'get_columns' ), 0 );
</del><ins>+ add_filter( 'manage_' . $screen->id . '_columns', array( $this, 'get_columns' ), 0 );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunktestsphpunitincludesutilsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/includes/utils.php (25253 => 25254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/includes/utils.php 2013-09-05 16:22:14 UTC (rev 25253)
+++ trunk/tests/phpunit/includes/utils.php 2013-09-05 16:33:50 UTC (rev 25254)
</span><span class="lines">@@ -133,8 +133,8 @@
</span><span class="cx"> $this->xml = xml_parser_create();
</span><span class="cx"> xml_set_object($this->xml, $this);
</span><span class="cx"> xml_parser_set_option($this->xml,XML_OPTION_CASE_FOLDING, 0);
</span><del>- xml_set_element_handler($this->xml, array(&$this, 'startHandler'), array(&$this, 'endHandler'));
- xml_set_character_data_handler($this->xml, array(&$this, 'dataHandler'));
</del><ins>+ xml_set_element_handler($this->xml, array($this, 'startHandler'), array($this, 'endHandler'));
+ xml_set_character_data_handler($this->xml, array($this, 'dataHandler'));
</ins><span class="cx"> $this->parse($in);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunktestsphpunitincludeswpprofilerphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/includes/wp-profiler.php (25253 => 25254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/includes/wp-profiler.php 2013-09-05 16:22:14 UTC (rev 25253)
+++ trunk/tests/phpunit/includes/wp-profiler.php 2013-09-05 16:33:50 UTC (rev 25254)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> if (!$this->stack) {
</span><span class="cx"> // log all actions and filters
</span><del>- add_filter('all', array(&$this, 'log_filter'));
</del><ins>+ add_filter('all', array($this, 'log_filter'));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // reset the wpdb queries log, storing it on the profile stack if necessary
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!$this->stack) {
</span><del>- remove_filter('all', array(&$this, 'log_filter'));
</del><ins>+ remove_filter('all', array($this, 'log_filter'));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunktestsphpunittestsadminincludesThemephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/admin/includesTheme.php (25253 => 25254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/admin/includesTheme.php 2013-09-05 16:22:14 UTC (rev 25253)
+++ trunk/tests/phpunit/tests/admin/includesTheme.php 2013-09-05 16:33:50 UTC (rev 25254)
</span><span class="lines">@@ -10,9 +10,9 @@
</span><span class="cx"> $this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
</span><span class="cx"> $GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', $this->theme_root );
</span><span class="cx">
</span><del>- add_filter('theme_root', array(&$this, '_theme_root'));
- add_filter( 'stylesheet_root', array(&$this, '_theme_root') );
- add_filter( 'template_root', array(&$this, '_theme_root') );
</del><ins>+ add_filter('theme_root', array($this, '_theme_root'));
+ add_filter( 'stylesheet_root', array($this, '_theme_root') );
+ add_filter( 'template_root', array($this, '_theme_root') );
</ins><span class="cx">
</span><span class="cx"> // clear caches
</span><span class="cx"> wp_clean_themes_cache();
</span><span class="lines">@@ -21,9 +21,9 @@
</span><span class="cx">
</span><span class="cx"> function tearDown() {
</span><span class="cx"> $GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
</span><del>- remove_filter('theme_root', array(&$this, '_theme_root'));
- remove_filter( 'stylesheet_root', array(&$this, '_theme_root') );
- remove_filter( 'template_root', array(&$this, '_theme_root') );
</del><ins>+ remove_filter('theme_root', array($this, '_theme_root'));
+ remove_filter( 'stylesheet_root', array($this, '_theme_root') );
+ remove_filter( 'template_root', array($this, '_theme_root') );
</ins><span class="cx">
</span><span class="cx"> wp_clean_themes_cache();
</span><span class="cx"> unset( $GLOBALS['wp_themes'] );
</span></span></pre></div>
<a id="trunktestsphpunittestsfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/filters.php (25253 => 25254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/filters.php 2013-09-05 16:22:14 UTC (rev 25253)
+++ trunk/tests/phpunit/tests/filters.php 2013-09-05 16:33:50 UTC (rev 25254)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> $tag = rand_str();
</span><span class="cx"> $val = rand_str();
</span><span class="cx">
</span><del>- add_filter($tag, array(&$a, 'filter'));
</del><ins>+ add_filter($tag, array($a, 'filter'));
</ins><span class="cx"> $this->assertEquals($val, apply_filters($tag, $val));
</span><span class="cx">
</span><span class="cx"> // only one event occurred for the hook, with empty args
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> $tag = rand_str();
</span><span class="cx"> $val = rand_str();
</span><span class="cx">
</span><del>- add_filter($tag, array(&$a, 'filter'));
</del><ins>+ add_filter($tag, array($a, 'filter'));
</ins><span class="cx"> $this->assertEquals($val, apply_filters($tag, $val));
</span><span class="cx">
</span><span class="cx"> // make sure our hook was called correctly
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> $this->assertEquals(array($tag), $a->get_tags());
</span><span class="cx">
</span><span class="cx"> // now remove the filter, do it again, and make sure it's not called this time
</span><del>- remove_filter($tag, array(&$a, 'filter'));
</del><ins>+ remove_filter($tag, array($a, 'filter'));
</ins><span class="cx"> $this->assertEquals($val, apply_filters($tag, $val));
</span><span class="cx"> $this->assertEquals(1, $a->get_call_count());
</span><span class="cx"> $this->assertEquals(array($tag), $a->get_tags());
</span><span class="lines">@@ -66,8 +66,8 @@
</span><span class="cx"> $val = rand_str();
</span><span class="cx">
</span><span class="cx"> // add both filters to the hook
</span><del>- add_filter($tag, array(&$a1, 'filter'));
- add_filter($tag, array(&$a2, 'filter'));
</del><ins>+ add_filter($tag, array($a1, 'filter'));
+ add_filter($tag, array($a2, 'filter'));
</ins><span class="cx">
</span><span class="cx"> $this->assertEquals($val, apply_filters($tag, $val));
</span><span class="cx">
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> $val = rand_str();
</span><span class="cx"> $arg1 = rand_str();
</span><span class="cx">
</span><del>- add_filter($tag, array(&$a, 'filter'), 10, 2);
</del><ins>+ add_filter($tag, array($a, 'filter'), 10, 2);
</ins><span class="cx"> // call the filter with a single argument
</span><span class="cx"> $this->assertEquals($val, apply_filters($tag, $val, $arg1));
</span><span class="cx">
</span><span class="lines">@@ -99,8 +99,8 @@
</span><span class="cx"> $arg2 = rand_str();
</span><span class="cx">
</span><span class="cx"> // a1 accepts two arguments, a2 doesn't
</span><del>- add_filter($tag, array(&$a1, 'filter'), 10, 3);
- add_filter($tag, array(&$a2, 'filter'));
</del><ins>+ add_filter($tag, array($a1, 'filter'), 10, 3);
+ add_filter($tag, array($a2, 'filter'));
</ins><span class="cx"> // call the filter with two arguments
</span><span class="cx"> $this->assertEquals($val, apply_filters($tag, $val, $arg1, $arg2));
</span><span class="cx">
</span><span class="lines">@@ -119,8 +119,8 @@
</span><span class="cx"> $val = rand_str();
</span><span class="cx">
</span><span class="cx"> // make two filters with different priorities
</span><del>- add_filter($tag, array(&$a, 'filter'), 10);
- add_filter($tag, array(&$a, 'filter2'), 9);
</del><ins>+ add_filter($tag, array($a, 'filter'), 10);
+ add_filter($tag, array($a, 'filter2'), 9);
</ins><span class="cx"> $this->assertEquals($val, apply_filters($tag, $val));
</span><span class="cx">
</span><span class="cx"> // there should be two events, one per filter
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> $val = rand_str();
</span><span class="cx">
</span><span class="cx"> // add an 'all' filter
</span><del>- add_filter('all', array(&$a, 'filterall'));
</del><ins>+ add_filter('all', array($a, 'filterall'));
</ins><span class="cx"> // do some filters
</span><span class="cx"> $this->assertEquals($val, apply_filters($tag1, $val));
</span><span class="cx"> $this->assertEquals($val, apply_filters($tag2, $val));
</span><span class="lines">@@ -163,8 +163,8 @@
</span><span class="cx"> // the right hooks should have been called in order
</span><span class="cx"> $this->assertEquals(array($tag1, $tag2, $tag1, $tag1), $a->get_tags());
</span><span class="cx">
</span><del>- remove_filter('all', array(&$a, 'filterall'));
- $this->assertFalse( has_filter('all', array(&$a, 'filterall')) );
</del><ins>+ remove_filter('all', array($a, 'filterall'));
+ $this->assertFalse( has_filter('all', array($a, 'filterall')) );
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -173,9 +173,9 @@
</span><span class="cx"> $tag = rand_str();
</span><span class="cx"> $val = rand_str();
</span><span class="cx">
</span><del>- add_filter('all', array(&$a, 'filterall'));
</del><ins>+ add_filter('all', array($a, 'filterall'));
</ins><span class="cx"> $this->assertTrue( has_filter('all') );
</span><del>- $this->assertEquals( 10, has_filter('all', array(&$a, 'filterall')) );
</del><ins>+ $this->assertEquals( 10, has_filter('all', array($a, 'filterall')) );
</ins><span class="cx"> $this->assertEquals($val, apply_filters($tag, $val));
</span><span class="cx">
</span><span class="cx"> // make sure our hook was called correctly
</span><span class="lines">@@ -183,8 +183,8 @@
</span><span class="cx"> $this->assertEquals(array($tag), $a->get_tags());
</span><span class="cx">
</span><span class="cx"> // now remove the filter, do it again, and make sure it's not called this time
</span><del>- remove_filter('all', array(&$a, 'filterall'));
- $this->assertFalse( has_filter('all', array(&$a, 'filterall')) );
</del><ins>+ remove_filter('all', array($a, 'filterall'));
+ $this->assertFalse( has_filter('all', array($a, 'filterall')) );
</ins><span class="cx"> $this->assertFalse( has_filter('all') );
</span><span class="cx"> $this->assertEquals($val, apply_filters($tag, $val));
</span><span class="cx"> // call cound should remain at 1
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> $a = new MockAction();
</span><span class="cx"> $tag = rand_str();
</span><span class="cx">
</span><del>- add_action($tag, array(&$a, 'filter'));
</del><ins>+ add_action($tag, array($a, 'filter'));
</ins><span class="cx">
</span><span class="cx"> apply_filters_ref_array($tag, array(&$obj));
</span><span class="cx">
</span><span class="lines">@@ -220,8 +220,8 @@
</span><span class="cx"> $b = new MockAction();
</span><span class="cx"> $tag = rand_str();
</span><span class="cx">
</span><del>- add_action($tag, array(&$a, 'filter_append'), 10, 2);
- add_action($tag, array(&$b, 'filter_append'), 10, 2);
</del><ins>+ add_action($tag, array($a, 'filter_append'), 10, 2);
+ add_action($tag, array($b, 'filter_append'), 10, 2);
</ins><span class="cx">
</span><span class="cx"> $result = apply_filters_ref_array($tag, array('string', &$obj));
</span><span class="cx">
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function _self_removal($tag) {
</span><del>- remove_action( $tag, array(&$this, '_self_removal'), 10, 1 );
</del><ins>+ remove_action( $tag, array($this, '_self_removal'), 10, 1 );
</ins><span class="cx"> return $tag;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -254,9 +254,9 @@
</span><span class="cx"> $a = new MockAction();
</span><span class="cx"> $b = new MockAction();
</span><span class="cx">
</span><del>- add_action( $tag, array(&$a, 'filter_append'), 11, 1 );
- add_action( $tag, array(&$b, 'filter_append'), 12, 1 );
- add_action( $tag, array(&$this, '_self_removal'), 10, 1 );
</del><ins>+ add_action( $tag, array($a, 'filter_append'), 11, 1 );
+ add_action( $tag, array($b, 'filter_append'), 12, 1 );
+ add_action( $tag, array($this, '_self_removal'), 10, 1 );
</ins><span class="cx">
</span><span class="cx"> $result = apply_filters($tag, $tag);
</span><span class="cx"> $this->assertEquals( 1, $a->get_call_count(), 'priority 11 filters should run after priority 10 empties itself' );
</span></span></pre></div>
<a id="trunktestsphpunittestsmetaphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/meta.php (25253 => 25254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/meta.php 2013-09-05 16:22:14 UTC (rev 25253)
+++ trunk/tests/phpunit/tests/meta.php 2013-09-05 16:33:50 UTC (rev 25254)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> $meta = sanitize_meta( 'some_meta', 'unsanitized', 'post' );
</span><span class="cx"> $this->assertEquals( 'unsanitized', $meta );
</span><span class="cx">
</span><del>- register_meta( 'post', 'some_meta', array( &$this, '_meta_sanitize_cb' ) );
</del><ins>+ register_meta( 'post', 'some_meta', array( $this, '_meta_sanitize_cb' ) );
</ins><span class="cx"> $meta = sanitize_meta( 'some_meta', 'unsanitized', 'post' );
</span><span class="cx"> $this->assertEquals( 'sanitized', $meta );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunktestsphpunitteststhemeWPThemephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/theme/WPTheme.php (25253 => 25254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/theme/WPTheme.php 2013-09-05 16:22:14 UTC (rev 25253)
+++ trunk/tests/phpunit/tests/theme/WPTheme.php 2013-09-05 16:33:50 UTC (rev 25254)
</span><span class="lines">@@ -10,9 +10,9 @@
</span><span class="cx"> $this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
</span><span class="cx"> $GLOBALS['wp_theme_directories'] = array( $this->theme_root );
</span><span class="cx">
</span><del>- add_filter('theme_root', array(&$this, '_theme_root'));
- add_filter( 'stylesheet_root', array(&$this, '_theme_root') );
- add_filter( 'template_root', array(&$this, '_theme_root') );
</del><ins>+ add_filter('theme_root', array($this, '_theme_root'));
+ add_filter( 'stylesheet_root', array($this, '_theme_root') );
+ add_filter( 'template_root', array($this, '_theme_root') );
</ins><span class="cx"> // clear caches
</span><span class="cx"> wp_clean_themes_cache();
</span><span class="cx"> unset( $GLOBALS['wp_themes'] );
</span><span class="lines">@@ -20,9 +20,9 @@
</span><span class="cx">
</span><span class="cx"> function tearDown() {
</span><span class="cx"> $GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
</span><del>- remove_filter('theme_root', array(&$this, '_theme_root'));
- remove_filter( 'stylesheet_root', array(&$this, '_theme_root') );
- remove_filter( 'template_root', array(&$this, '_theme_root') );
</del><ins>+ remove_filter('theme_root', array($this, '_theme_root'));
+ remove_filter( 'stylesheet_root', array($this, '_theme_root') );
+ remove_filter( 'template_root', array($this, '_theme_root') );
</ins><span class="cx"> wp_clean_themes_cache();
</span><span class="cx"> unset( $GLOBALS['wp_themes'] );
</span><span class="cx"> parent::tearDown();
</span></span></pre></div>
<a id="trunktestsphpunitteststhemethemeDirphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/theme/themeDir.php (25253 => 25254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/theme/themeDir.php 2013-09-05 16:22:14 UTC (rev 25253)
+++ trunk/tests/phpunit/tests/theme/themeDir.php 2013-09-05 16:33:50 UTC (rev 25254)
</span><span class="lines">@@ -15,9 +15,9 @@
</span><span class="cx"> // /themes is necessary as theme.php functions assume /themes is the root if there is only one root.
</span><span class="cx"> $GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', $this->theme_root );
</span><span class="cx">
</span><del>- add_filter('theme_root', array(&$this, '_theme_root'));
- add_filter( 'stylesheet_root', array(&$this, '_theme_root') );
- add_filter( 'template_root', array(&$this, '_theme_root') );
</del><ins>+ add_filter('theme_root', array($this, '_theme_root'));
+ add_filter( 'stylesheet_root', array($this, '_theme_root') );
+ add_filter( 'template_root', array($this, '_theme_root') );
</ins><span class="cx"> // clear caches
</span><span class="cx"> wp_clean_themes_cache();
</span><span class="cx"> unset( $GLOBALS['wp_themes'] );
</span><span class="lines">@@ -25,9 +25,9 @@
</span><span class="cx">
</span><span class="cx"> function tearDown() {
</span><span class="cx"> $GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
</span><del>- remove_filter('theme_root', array(&$this, '_theme_root'));
- remove_filter( 'stylesheet_root', array(&$this, '_theme_root') );
- remove_filter( 'template_root', array(&$this, '_theme_root') );
</del><ins>+ remove_filter('theme_root', array($this, '_theme_root'));
+ remove_filter( 'stylesheet_root', array($this, '_theme_root') );
+ remove_filter( 'template_root', array($this, '_theme_root') );
</ins><span class="cx"> wp_clean_themes_cache();
</span><span class="cx"> unset( $GLOBALS['wp_themes'] );
</span><span class="cx"> parent::tearDown();
</span></span></pre></div>
<a id="trunktestsphpunittestsusercapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/user/capabilities.php (25253 => 25254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/user/capabilities.php 2013-09-05 16:22:14 UTC (rev 25253)
+++ trunk/tests/phpunit/tests/user/capabilities.php 2013-09-05 16:33:50 UTC (rev 25254)
</span><span class="lines">@@ -508,7 +508,7 @@
</span><span class="cx"> $this->assertFalse( $admin->has_cap('add_post_meta', $post, '_protected') );
</span><span class="cx"> $this->assertFalse( $admin->has_cap('delete_post_meta', $post, '_protected') );
</span><span class="cx">
</span><del>- register_meta( 'post', '_protected', array( &$this, '_meta_filter' ), array( &$this, '_meta_yes_you_can' ) );
</del><ins>+ register_meta( 'post', '_protected', array( $this, '_meta_filter' ), array( $this, '_meta_yes_you_can' ) );
</ins><span class="cx"> $this->assertTrue( $admin->has_cap('edit_post_meta', $post, '_protected') );
</span><span class="cx"> $this->assertTrue( $admin->has_cap('add_post_meta', $post, '_protected') );
</span><span class="cx"> $this->assertTrue( $admin->has_cap('delete_post_meta', $post, '_protected') );
</span><span class="lines">@@ -517,7 +517,7 @@
</span><span class="cx"> $this->assertTrue( $admin->has_cap('add_post_meta', $post, 'not_protected') );
</span><span class="cx"> $this->assertTrue( $admin->has_cap('delete_post_meta', $post, 'not_protected') );
</span><span class="cx">
</span><del>- register_meta( 'post', 'not_protected', array( &$this, '_meta_filter' ), array( &$this, '_meta_no_you_cant' ) );
</del><ins>+ register_meta( 'post', 'not_protected', array( $this, '_meta_filter' ), array( $this, '_meta_no_you_cant' ) );
</ins><span class="cx"> $this->assertFalse( $admin->has_cap('edit_post_meta', $post, 'not_protected') );
</span><span class="cx"> $this->assertFalse( $admin->has_cap('add_post_meta', $post, 'not_protected') );
</span><span class="cx"> $this->assertFalse( $admin->has_cap('delete_post_meta', $post, 'not_protected') );
</span></span></pre></div>
<a id="trunktoolsi18nmakepotphp"></a>
<div class="modfile"><h4>Modified: trunk/tools/i18n/makepot.php (25253 => 25254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tools/i18n/makepot.php 2013-09-05 16:22:14 UTC (rev 25253)
+++ trunk/tools/i18n/makepot.php 2013-09-05 16:33:50 UTC (rev 25254)
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> return $this->wp_generic( $dir, array(
</span><span class="cx"> 'project' => 'wp-core', 'output' => $output,
</span><span class="cx"> 'extract_not_gettexted' => true,
</span><del>- 'not_gettexted_files_filter' => array( &$this, 'is_not_ms_file' ),
</del><ins>+ 'not_gettexted_files_filter' => array( $this, 'is_not_ms_file' ),
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -340,7 +340,7 @@
</span><span class="cx"> 'includes' => $this->ms_files, 'excludes' => array(),
</span><span class="cx"> 'default_output' => 'wordpress-ms.pot',
</span><span class="cx"> 'extract_not_gettexted' => true,
</span><del>- 'not_gettexted_files_filter' => array( &$this, 'is_ms_file' ),
</del><ins>+ 'not_gettexted_files_filter' => array( $this, 'is_ms_file' ),
</ins><span class="cx"> ) );
</span><span class="cx"> if ( !$ms_result ) {
</span><span class="cx"> return false;
</span><span class="lines">@@ -557,7 +557,7 @@
</span><span class="cx"> if ($included_files[0] == __FILE__) {
</span><span class="cx"> $makepot = new MakePOT;
</span><span class="cx"> if ((3 == count($argv) || 4 == count($argv)) && in_array($method = str_replace('-', '_', $argv[1]), get_class_methods($makepot))) {
</span><del>- $res = call_user_func(array(&$makepot, $method), realpath($argv[2]), isset($argv[3])? $argv[3] : null);
</del><ins>+ $res = call_user_func(array($makepot, $method), realpath($argv[2]), isset($argv[3])? $argv[3] : null);
</ins><span class="cx"> if (false === $res) {
</span><span class="cx"> fwrite(STDERR, "Couldn't generate POT file!\n");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunktoolsi18nnotgettextedphp"></a>
<div class="modfile"><h4>Modified: trunk/tools/i18n/not-gettexted.php (25253 => 25254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tools/i18n/not-gettexted.php 2013-09-05 16:22:14 UTC (rev 25253)
+++ trunk/tools/i18n/not-gettexted.php 2013-09-05 16:33:50 UTC (rev 25254)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> if ('.' == $item || '..' == $item)
</span><span class="cx"> continue;
</span><span class="cx"> if ('.php' == substr($item, -4))
</span><del>- $files[] = $full_item;
</del><ins>+ $files[] = $full_item;
</ins><span class="cx"> if (is_dir($full_item))
</span><span class="cx"> $files += array_merge($files, NotGettexted::list_php_files($full_item, $files));
</span><span class="cx"> }
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> if ($this->STAGE_START_COMMENT <= $stage && $stage <= $this->STAGE_WHITESPACE_AFTER && '/'.$current_comment_id == $matches[1]) {
</span><del>- $stage = $this->STAGE_END_COMMENT;
</del><ins>+ $stage = $this->STAGE_END_COMMENT;
</ins><span class="cx"> $this->logmsg('end comment', $current_comment_id);
</span><span class="cx"> $result .= call_user_func($other_action, $token);
</span><span class="cx"> if (!is_null($register_action)) call_user_func($register_action, $current_string, $current_comment_id, $current_string_line);
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> foreach($filenames as $filename) {
</span><span class="cx"> $tokens = token_get_all(file_get_contents($filename));
</span><span class="cx"> $aggregator = $this->make_string_aggregator($global_name, $filename);
</span><del>- $this->walk_tokens($tokens, array(&$this, 'ignore_token'), array(&$this, 'ignore_token'), $aggregator);
</del><ins>+ $this->walk_tokens($tokens, array($this, 'ignore_token'), array($this, 'ignore_token'), $aggregator);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $potf = '-' == $pot_filename? STDOUT : @fopen($pot_filename, 'a');
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> $source = file_get_contents($filename);
</span><span class="cx"> if ( strlen($source) > 150000 ) continue;
</span><span class="cx"> $tokens = token_get_all($source);
</span><del>- $new_file = $this->walk_tokens($tokens, $replacer, array(&$this, 'unchanged_token'));
</del><ins>+ $new_file = $this->walk_tokens($tokens, $replacer, array($this, 'unchanged_token'));
</ins><span class="cx"> $f = fopen($filename, 'w');
</span><span class="cx"> fwrite($f, $new_file);
</span><span class="cx"> fclose($f);
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> $this->usage();
</span><span class="cx"> exit(1);
</span><span class="cx"> }
</span><del>- call_user_func_array(array(&$this, $this->commands[$argv[1]]), array_slice($argv, 2));
</del><ins>+ call_user_func_array(array($this, $this->commands[$argv[1]]), array_slice($argv, 2));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunktoolsi18npotextmetaphp"></a>
<div class="modfile"><h4>Modified: trunk/tools/i18n/pot-ext-meta.php (25253 => 25254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tools/i18n/pot-ext-meta.php 2013-09-05 16:22:14 UTC (rev 25253)
+++ trunk/tools/i18n/pot-ext-meta.php 2013-09-05 16:33:50 UTC (rev 25254)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> if ( $headers )
</span><span class="cx"> $this->headers = (array) $headers;
</span><span class="cx"> if ( is_dir( $ext_filename ) ) {
</span><del>- $pot = implode('', array_map(array(&$this, 'load_from_file'), glob("$ext_filename/*.php")));
</del><ins>+ $pot = implode('', array_map(array($this, 'load_from_file'), glob("$ext_filename/*.php")));
</ins><span class="cx"> } else {
</span><span class="cx"> $pot = $this->load_from_file($ext_filename);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunktoolsi18ntNotGettextedTestphp"></a>
<div class="modfile"><h4>Modified: trunk/tools/i18n/t/NotGettextedTest.php (25253 => 25254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tools/i18n/t/NotGettextedTest.php 2013-09-05 16:22:14 UTC (rev 25253)
+++ trunk/tools/i18n/t/NotGettextedTest.php 2013-09-05 16:33:50 UTC (rev 25254)
</span><span class="lines">@@ -9,11 +9,11 @@
</span><span class="cx"> require_once dirname( dirname( __FILE__ ) ) . '/not-gettexted.php';
</span><span class="cx">
</span><span class="cx"> class NotGettextedTest extends PHPUnit_Framework_TestCase {
</span><del>-
</del><ins>+
</ins><span class="cx"> function __construct() {
</span><span class="cx"> $this->ng = new NotGettexted;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> function test_make_string_aggregator() {
</span><span class="cx"> global $baba;
</span><span class="cx"> $f = $this->ng->make_string_aggregator( 'baba', 'baba.php' );
</span><span class="lines">@@ -29,11 +29,11 @@
</span><span class="cx"> echo /* WP_I18N_GUGU*/ "yes" /* /WP_I18N_UGU */;
</span><span class="cx"> if ($x == "18181") { wp_die(sprintf(/*WP_I18N_DIE*/\'We died %d times!\'/*WP_I18N_DIE*/)); }
</span><span class="cx"> ?>';
</span><del>- $tokens = token_get_all($code);
- $this->assertEquals( '', $this->ng->walk_tokens( $tokens, array(&$this->ng, 'ignore_token'), array(&$this->ng, 'ignore_token') ) );
- $this->assertEquals( '"yes"\'We died %d times!\'', $this->ng->walk_tokens( $tokens, array(&$this->ng, 'unchanged_token'), array(&$this->ng, 'ignore_token') ) );
- $this->assertEquals( $code, $this->ng->walk_tokens( $tokens, array(&$this->ng, 'unchanged_token'), array(&$this->ng, 'unchanged_token') ) );
- $this->assertEquals( $code, $this->ng->walk_tokens( $tokens, array(&$this->ng, 'unchanged_token'), array(&$this->ng, 'unchanged_token') ) );
</del><ins>+ $tokens = token_get_all($code);
+ $this->assertEquals( '', $this->ng->walk_tokens( $tokens, array($this->ng, 'ignore_token'), array($this->ng, 'ignore_token') ) );
+ $this->assertEquals( '"yes"\'We died %d times!\'', $this->ng->walk_tokens( $tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'ignore_token') ) );
+ $this->assertEquals( $code, $this->ng->walk_tokens( $tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'unchanged_token') ) );
+ $this->assertEquals( $code, $this->ng->walk_tokens( $tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'unchanged_token') ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_replace() {
</span><span class="lines">@@ -43,4 +43,4 @@
</span><span class="cx"> $this->assertEquals( file_get_contents( 'data/not-gettexted-0-result.php' ), file_get_contents( 'data/not-gettexted-0-work.php' ) );
</span><span class="cx"> unlink( 'data/not-gettexted-0-work.php' );
</span><span class="cx"> }
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
</ins></span></pre>
</div>
</div>
</body>
</html>