Index: wp-admin/custom-background.php
===================================================================
--- wp-admin/custom-background.php	(revision 20117)
+++ wp-admin/custom-background.php	(working copy)
@@ -64,11 +64,11 @@
 		if ( ! current_user_can('edit_theme_options') )
 			return;
 
-		$this->page = $page = add_theme_page(__('Background'), __('Background'), 'edit_theme_options', 'custom-background', array(&$this, 'admin_page'));
+		$this->page = $page = add_theme_page(__('Background'), __('Background'), 'edit_theme_options', 'custom-background', array($this, 'admin_page'));
 
-		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);
+		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);
 
 		if ( $this->admin_header_callback )
 			add_action("admin_head-$page", $this->admin_header_callback, 51);
Index: wp-admin/custom-header.php
===================================================================
--- wp-admin/custom-header.php	(revision 20117)
+++ wp-admin/custom-header.php	(working copy)
@@ -82,13 +82,13 @@
 		if ( ! current_user_can('edit_theme_options') )
 			return;
 
-		$this->page = $page = add_theme_page(__('Header'), __('Header'), 'edit_theme_options', 'custom-header', array(&$this, 'admin_page'));
+		$this->page = $page = add_theme_page(__('Header'), __('Header'), 'edit_theme_options', 'custom-header', array($this, 'admin_page'));
 
-		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);
+		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);
 		add_action("admin_head-$page", $this->admin_header_callback, 51);
 	}
 
Index: wp-admin/includes/class-wp-importer.php
===================================================================
--- wp-admin/includes/class-wp-importer.php	(revision 20117)
+++ wp-admin/includes/class-wp-importer.php	(working copy)
@@ -182,7 +182,7 @@
 	 */
 	function get_page( $url, $username = '', $password = '', $head = false ) {
 		// Increase the timeout
-		add_filter( 'http_request_timeout', array( &$this, 'bump_request_timeout' ) );
+		add_filter( 'http_request_timeout', array( $this, 'bump_request_timeout' ) );
 
 		$headers = array();
 		$args = array();
Index: wp-admin/includes/class-wp-list-table.php
===================================================================
--- wp-admin/includes/class-wp-list-table.php	(revision 20117)
+++ wp-admin/includes/class-wp-list-table.php	(working copy)
@@ -86,7 +86,7 @@
 
 		$screen = get_current_screen();
 
-		add_filter( "manage_{$screen->id}_columns", array( &$this, 'get_columns' ), 0 );
+		add_filter( "manage_{$screen->id}_columns", array( $this, 'get_columns' ), 0 );
 
 		if ( !$args['plural'] )
 			$args['plural'] = $screen->base;
@@ -98,7 +98,7 @@
 
 		if ( $args['ajax'] ) {
 			// wp_enqueue_script( 'list-table' );
-			add_action( 'admin_footer', array( &$this, '_js_vars' ) );
+			add_action( 'admin_footer', array( $this, '_js_vars' ) );
 		}
 	}
 
@@ -854,7 +854,7 @@
 			}
 			elseif ( method_exists( $this, 'column_' . $column_name ) ) {
 				echo "<td $attributes>";
-				echo call_user_func( array( &$this, 'column_' . $column_name ), $item );
+				echo call_user_func( array( $this, 'column_' . $column_name ), $item );
 				echo "</td>";
 			}
 			else {
Index: wp-admin/includes/class-wp-ms-themes-list-table.php
===================================================================
--- wp-admin/includes/class-wp-ms-themes-list-table.php	(revision 20117)
+++ wp-admin/includes/class-wp-ms-themes-list-table.php	(working copy)
@@ -87,7 +87,7 @@
 
 		if ( $s ) {
 			$status = 'search';
-			$themes['search'] = array_filter( $themes['all'], array( &$this, '_search_callback' ) );
+			$themes['search'] = array_filter( $themes['all'], array( $this, '_search_callback' ) );
 		}
 
 		$totals = array();
@@ -111,7 +111,7 @@
 				if ( 'ASC' == $order )
 					$this->items = array_reverse( $this->items );
 			} else {
-				uasort( $this->items, array( &$this, '_order_callback' ) );
+				uasort( $this->items, array( $this, '_order_callback' ) );
 			}
 		}
 
Index: wp-admin/includes/class-wp-plugins-list-table.php
===================================================================
--- wp-admin/includes/class-wp-plugins-list-table.php	(revision 20117)
+++ wp-admin/includes/class-wp-plugins-list-table.php	(working copy)
@@ -105,7 +105,7 @@
 
 		if ( $s ) {
 			$status = 'search';
-			$plugins['search'] = array_filter( $plugins['all'], array( &$this, '_search_callback' ) );
+			$plugins['search'] = array_filter( $plugins['all'], array( $this, '_search_callback' ) );
 		}
 
 		$totals = array();
@@ -127,7 +127,7 @@
 			$orderby = ucfirst( $orderby );
 			$order = strtoupper( $order );
 
-			uasort( $this->items, array( &$this, '_order_callback' ) );
+			uasort( $this->items, array( $this, '_order_callback' ) );
 		}
 
 		$plugins_per_page = $this->get_items_per_page( str_replace( '-', '_', $screen->id . '_per_page' ), 999 );
Index: wp-admin/includes/class-wp-upgrader.php
===================================================================
--- wp-admin/includes/class-wp-upgrader.php	(revision 20117)
+++ wp-admin/includes/class-wp-upgrader.php	(working copy)
@@ -395,7 +395,7 @@
 		$this->init();
 		$this->install_strings();
 
-		add_filter('upgrader_source_selection', array(&$this, 'check_package') );
+		add_filter('upgrader_source_selection', array($this, 'check_package') );
 
 		$this->run(array(
 					'package' => $package,
@@ -405,7 +405,7 @@
 					'hook_extra' => array()
 					));
 
-		remove_filter('upgrader_source_selection', array(&$this, 'check_package') );
+		remove_filter('upgrader_source_selection', array($this, 'check_package') );
 
 		if ( ! $this->result || is_wp_error($this->result) )
 			return $this->result;
@@ -433,8 +433,8 @@
 		// Get the URL to the zip file
 		$r = $current->response[ $plugin ];
 
-		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);
+		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.
 
 		$this->run(array(
@@ -448,8 +448,8 @@
 				));
 
 		// Cleanup our hooks, in case something else does a upgrade on this connection.
-		remove_filter('upgrader_pre_install', array(&$this, 'deactivate_plugin_before_upgrade'));
-		remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'));
+		remove_filter('upgrader_pre_install', array($this, 'deactivate_plugin_before_upgrade'));
+		remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'));
 
 		if ( ! $this->result || is_wp_error($this->result) )
 			return $this->result;
@@ -466,7 +466,7 @@
 
 		$current = get_site_transient( 'update_plugins' );
 
-		add_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'), 10, 4);
+		add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4);
 
 		$this->skin->header();
 
@@ -533,7 +533,7 @@
 		$this->skin->footer();
 
 		// Cleanup our hooks, in case something else does a upgrade on this connection.
-		remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'));
+		remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'));
 
 		// Force refresh of plugin update information
 		delete_site_transient('update_plugins');
@@ -669,7 +669,7 @@
 		$this->init();
 		$this->install_strings();
 
-		add_filter('upgrader_source_selection', array(&$this, 'check_package') );
+		add_filter('upgrader_source_selection', array($this, 'check_package') );
 
 		$options = array(
 						'package' => $package,
@@ -680,7 +680,7 @@
 
 		$this->run($options);
 
-		remove_filter('upgrader_source_selection', array(&$this, 'check_package') );
+		remove_filter('upgrader_source_selection', array($this, 'check_package') );
 
 		if ( ! $this->result || is_wp_error($this->result) )
 			return $this->result;
@@ -708,9 +708,9 @@
 
 		$r = $current->response[ $theme ];
 
-		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);
+		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);
 
 		$options = array(
 						'package' => $r['package'],
@@ -724,9 +724,9 @@
 
 		$this->run($options);
 
-		remove_filter('upgrader_pre_install', array(&$this, 'current_before'), 10, 2);
-		remove_filter('upgrader_post_install', array(&$this, 'current_after'), 10, 2);
-		remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_theme'), 10, 4);
+		remove_filter('upgrader_pre_install', array($this, 'current_before'), 10, 2);
+		remove_filter('upgrader_post_install', array($this, 'current_after'), 10, 2);
+		remove_filter('upgrader_clear_destination', array($this, 'delete_old_theme'), 10, 4);
 
 		if ( ! $this->result || is_wp_error($this->result) )
 			return $this->result;
@@ -745,9 +745,9 @@
 
 		$current = get_site_transient( 'update_themes' );
 
-		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);
+		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);
 
 		$this->skin->header();
 
@@ -814,9 +814,9 @@
 		$this->skin->footer();
 
 		// Cleanup our hooks, in case something else does a upgrade on this connection.
-		remove_filter('upgrader_pre_install', array(&$this, 'current_before'), 10, 2);
-		remove_filter('upgrader_post_install', array(&$this, 'current_after'), 10, 2);
-		remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_theme'), 10, 4);
+		remove_filter('upgrader_pre_install', array($this, 'current_before'), 10, 2);
+		remove_filter('upgrader_post_install', array($this, 'current_after'), 10, 2);
+		remove_filter('upgrader_clear_destination', array($this, 'delete_old_theme'), 10, 4);
 
 		// Force refresh of theme update information
 		delete_site_transient('update_themes');
Index: wp-admin/includes/deprecated.php
===================================================================
--- wp-admin/includes/deprecated.php	(revision 20117)
+++ wp-admin/includes/deprecated.php	(working copy)
@@ -501,7 +501,7 @@
 			$this->query_where .= " AND $wpdb->users.ID = $wpdb->usermeta.user_id AND meta_key = '{$level_key}'";
 		}
 
-		do_action_ref_array( 'pre_user_search', array( &$this ) );
+		do_action_ref_array( 'pre_user_search', array( $this ) );
 	}
 
 	/**
Index: wp-admin/includes/list-table.php
===================================================================
--- wp-admin/includes/list-table.php	(revision 20117)
+++ wp-admin/includes/list-table.php	(working copy)
@@ -86,7 +86,7 @@
 
 		if ( !empty( $columns ) ) {
 			$this->_columns = $columns;
-			add_filter( 'manage_' . $screen->id . '_columns', array( &$this, 'get_columns' ), 0 );
+			add_filter( 'manage_' . $screen->id . '_columns', array( $this, 'get_columns' ), 0 );
 		}
 	}
 
Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php	(revision 20117)
+++ wp-admin/includes/template.php	(working copy)
@@ -134,10 +134,10 @@
 		}
 
 		// Put checked cats on top
-		echo call_user_func_array(array(&$walker, 'walk'), array($checked_categories, 0, $args));
+		echo call_user_func_array(array($walker, 'walk'), array($checked_categories, 0, $args));
 	}
 	// Then the rest of them
-	echo call_user_func_array(array(&$walker, 'walk'), array($categories, 0, $args));
+	echo call_user_func_array(array($walker, 'walk'), array($categories, 0, $args));
 }
 
 /**
Index: wp-admin/includes/user.php
===================================================================
--- wp-admin/includes/user.php	(revision 20117)
+++ wp-admin/includes/user.php	(working copy)
@@ -149,7 +149,7 @@
 	}
 
 	// Allow plugins to return their own errors.
-	do_action_ref_array('user_profile_update_errors', array ( &$errors, $update, &$user ) );
+	do_action_ref_array('user_profile_update_errors', array ( $errors, $update, $user ) );
 
 	if ( $errors->get_error_codes() )
 		return $errors;
Index: wp-content/themes/twentyeleven/inc/widgets.php
===================================================================
--- wp-content/themes/twentyeleven/inc/widgets.php	(revision 20117)
+++ wp-content/themes/twentyeleven/inc/widgets.php	(working copy)
@@ -20,9 +20,9 @@
 		$this->WP_Widget( 'widget_twentyeleven_ephemera', __( 'Twenty Eleven Ephemera', 'twentyeleven' ), $widget_ops );
 		$this->alt_option_name = 'widget_twentyeleven_ephemera';
 
-		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' ) );
+		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' ) );
 	}
 
 	/**
Index: wp-includes/admin-bar.php
===================================================================
--- wp-includes/admin-bar.php	(revision 20117)
+++ wp-includes/admin-bar.php	(working copy)
@@ -55,7 +55,7 @@
 	if ( ! is_admin_bar_showing() || ! is_object( $wp_admin_bar ) )
 		return false;
 
-	do_action_ref_array( 'admin_bar_menu', array( &$wp_admin_bar ) );
+	do_action_ref_array( 'admin_bar_menu', array( $wp_admin_bar ) );
 
 	do_action( 'wp_before_admin_bar_render' );
 
Index: wp-includes/atomlib.php
===================================================================
--- wp-includes/atomlib.php	(revision 20117)
+++ wp-includes/atomlib.php	(working copy)
@@ -107,7 +107,7 @@
 
     function parse() {
 
-        set_error_handler(array(&$this, 'error_handler'));
+        set_error_handler(array($this, 'error_handler'));
 
         array_unshift($this->ns_contexts, array());
 
Index: wp-includes/cache.php
===================================================================
--- wp-includes/cache.php	(revision 20117)
+++ wp-includes/cache.php	(working copy)
@@ -548,7 +548,7 @@
 		 * @todo This should be moved to the PHP4 style constructor, PHP5
 		 * already calls __destruct()
 		 */
-		register_shutdown_function(array(&$this, "__destruct"));
+		register_shutdown_function(array($this, "__destruct"));
 	}
 
 	/**
Index: wp-includes/capabilities.php
===================================================================
--- wp-includes/capabilities.php	(revision 20117)
+++ wp-includes/capabilities.php	(working copy)
@@ -673,7 +673,7 @@
 
 		//Filter out caps that are not role names and assign to $this->roles
 		if ( is_array( $this->caps ) )
-			$this->roles = array_filter( array_keys( $this->caps ), array( &$wp_roles, 'is_role' ) );
+			$this->roles = array_filter( array_keys( $this->caps ), array( $wp_roles, 'is_role' ) );
 
 		//Build $allcaps from role caps, overlay user's $caps
 		$this->allcaps = array();
@@ -1219,7 +1219,7 @@
 	$args = array_slice( func_get_args(), 2 );
 	$args = array_merge( array( $capability ), $args );
 
-	return call_user_func_array( array( &$user, 'has_cap' ), $args );
+	return call_user_func_array( array( $user, 'has_cap' ), $args );
 }
 
 /**
@@ -1243,7 +1243,7 @@
 	$args = array_slice( func_get_args(), 2 );
 	$args = array_merge( array( $capability ), $args );
 
-	return call_user_func_array( array( &$author, 'has_cap' ), $args );
+	return call_user_func_array( array( $author, 'has_cap' ), $args );
 }
 
 /**
@@ -1265,7 +1265,7 @@
 	$args = array_slice( func_get_args(), 2 );
 	$args = array_merge( array( $capability ), $args );
 
-	return call_user_func_array( array( &$user, 'has_cap' ), $args );
+	return call_user_func_array( array( $user, 'has_cap' ), $args );
 }
 
 /**
Index: wp-includes/category-template.php
===================================================================
--- wp-includes/category-template.php	(revision 20117)
+++ wp-includes/category-template.php	(working copy)
@@ -735,7 +735,7 @@
 	else
 		$walker = $args[2]['walker'];
 
-	return call_user_func_array(array( &$walker, 'walk' ), $args );
+	return call_user_func_array(array( $walker, 'walk' ), $args );
 }
 
 /**
@@ -753,7 +753,7 @@
 	else
 		$walker = $args[2]['walker'];
 
-	return call_user_func_array(array( &$walker, 'walk' ), $args );
+	return call_user_func_array(array( $walker, 'walk' ), $args );
 }
 
 /**
Index: wp-includes/class-http.php
===================================================================
--- wp-includes/class-http.php	(revision 20117)
+++ wp-includes/class-http.php	(working copy)
@@ -1058,7 +1058,7 @@
 		}
 
 		if ( true === $r['blocking'] )
-			curl_setopt( $handle, CURLOPT_HEADERFUNCTION, array( &$this, 'stream_headers' ) );
+			curl_setopt( $handle, CURLOPT_HEADERFUNCTION, array( $this, 'stream_headers' ) );
 
 		curl_setopt( $handle, CURLOPT_HEADER, false );
 
@@ -1093,7 +1093,7 @@
 
 		// Cookies are not handled by the HTTP API currently. Allow for plugin authors to handle it
 		// themselves... Although, it is somewhat pointless without some reference.
-		do_action_ref_array( 'http_api_curl', array(&$handle) );
+		do_action_ref_array( 'http_api_curl', array($handle) );
 
 		// We don't need to return the body, so don't. Just execute request and return.
 		if ( ! $r['blocking'] ) {
Index: wp-includes/class-oembed.php
===================================================================
--- wp-includes/class-oembed.php	(revision 20117)
+++ wp-includes/class-oembed.php	(working copy)
@@ -51,7 +51,7 @@
 		) );
 
 		// Fix any embeds that contain new lines in the middle of the HTML which breaks wpautop().
-		add_filter( 'oembed_dataparse', array(&$this, '_strip_newlines'), 10, 3 );
+		add_filter( 'oembed_dataparse', array($this, '_strip_newlines'), 10, 3 );
 	}
 
 	/**
Index: wp-includes/class-simplepie.php
===================================================================
--- wp-includes/class-simplepie.php	(revision 20117)
+++ wp-includes/class-simplepie.php	(working copy)
@@ -3023,7 +3023,7 @@
 					$this->data['ordered_items'] = $this->data['items'];
 					if ($do_sort)
 					{
-						usort($this->data['ordered_items'], array(&$this, 'sort_items'));
+						usort($this->data['ordered_items'], array($this, 'sort_items'));
 					}
 				}
 				$items = $this->data['ordered_items'];
@@ -11929,7 +11929,7 @@
 	function replace_invalid_with_pct_encoding($string, $valid_chars, $case = SIMPLEPIE_SAME_CASE, $iprivate = false)
 	{
 		// Normalize as many pct-encoded sections as possible
-		$string = preg_replace_callback('/(?:%[A-Fa-f0-9]{2})+/', array(&$this, 'remove_iunreserved_percent_encoded'), $string);
+		$string = preg_replace_callback('/(?:%[A-Fa-f0-9]{2})+/', array($this, 'remove_iunreserved_percent_encoded'), $string);
 
 		// Replace invalid percent characters
 		$string = preg_replace('/%(?![A-Fa-f0-9]{2})/', '%25', $string);
@@ -13372,7 +13372,7 @@
 
 		foreach ($this->built_in as $method)
 		{
-			if (($returned = call_user_func(array(&$this, $method), $date)) !== false)
+			if (($returned = call_user_func(array($this, $method), $date)) !== false)
 			{
 				return $returned;
 			}
@@ -15161,7 +15161,7 @@
 						$pcre = "/<($tag)" . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . "(>(.*)<\/$tag" . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>|(\/)?>)/siU';
 						while (preg_match($pcre, $data))
 						{
-							$data = preg_replace_callback($pcre, array(&$this, 'do_strip_htmltags'), $data);
+							$data = preg_replace_callback($pcre, array($this, 'do_strip_htmltags'), $data);
 						}
 					}
 				}
Index: wp-includes/class-wp-customize-setting.php
===================================================================
--- wp-includes/class-wp-customize-setting.php	(revision 20117)
+++ wp-includes/class-wp-customize-setting.php	(working copy)
@@ -448,7 +448,7 @@
 		elseif ( empty( $keys ) ) // If there are no keys, we're replacing the root.
 			return $value;
 
-		$result = $this->multidimensional( &$root, $keys, true );
+		$result = $this->multidimensional( $root, $keys, true );
 
 		if ( isset( $result ) )
 			$result['node'][ $result['key'] ] = $value;
Index: wp-includes/class-wp-walker.php
===================================================================
--- wp-includes/class-wp-walker.php	(revision 20117)
+++ wp-includes/class-wp-walker.php	(working copy)
@@ -126,7 +126,7 @@
 		if ( is_array( $args[0] ) )
 			$args[0]['has_children'] = ! empty( $children_elements[$element->$id_field] );
 		$cb_args = array_merge( array(&$output, $element, $depth), $args);
-		call_user_func_array(array(&$this, 'start_el'), $cb_args);
+		call_user_func_array(array($this, 'start_el'), $cb_args);
 
 		$id = $element->$id_field;
 
@@ -139,7 +139,7 @@
 					$newlevel = true;
 					//start the child delimiter
 					$cb_args = array_merge( array(&$output, $depth), $args);
-					call_user_func_array(array(&$this, 'start_lvl'), $cb_args);
+					call_user_func_array(array($this, 'start_lvl'), $cb_args);
 				}
 				$this->display_element( $child, $children_elements, $max_depth, $depth + 1, $args, $output );
 			}
@@ -149,12 +149,12 @@
 		if ( isset($newlevel) && $newlevel ){
 			//end the child delimiter
 			$cb_args = array_merge( array(&$output, $depth), $args);
-			call_user_func_array(array(&$this, 'end_lvl'), $cb_args);
+			call_user_func_array(array($this, 'end_lvl'), $cb_args);
 		}
 
 		//end this element
 		$cb_args = array_merge( array(&$output, $element, $depth), $args);
-		call_user_func_array(array(&$this, 'end_el'), $cb_args);
+		call_user_func_array(array($this, 'end_el'), $cb_args);
 	}
 
 	/**
Index: wp-includes/class-wp.php
===================================================================
--- wp-includes/class-wp.php	(revision 20117)
+++ wp-includes/class-wp.php	(working copy)
@@ -304,7 +304,7 @@
 
 		$this->query_vars = apply_filters('request', $this->query_vars);
 
-		do_action_ref_array('parse_request', array(&$this));
+		do_action_ref_array('parse_request', array($this));
 	}
 
 	/**
@@ -379,7 +379,7 @@
 		if ( $exit_required )
 			exit();
 
-		do_action_ref_array('send_headers', array(&$this));
+		do_action_ref_array('send_headers', array($this));
 	}
 
 	/**
@@ -524,7 +524,7 @@
 		$this->query_posts();
 		$this->handle_404();
 		$this->register_globals();
-		do_action_ref_array('wp', array(&$this));
+		do_action_ref_array('wp', array($this));
 	}
 
 }
@@ -601,7 +601,7 @@
 	 * @return string
 	 */
 	function _map() {
-		$callback = array(&$this, 'callback');
+		$callback = array($this, 'callback');
 		return preg_replace_callback($this->_pattern, $callback, $this->_subject);
 	}
 
Index: wp-includes/comment.php
===================================================================
--- wp-includes/comment.php	(revision 20117)
+++ wp-includes/comment.php	(working copy)
@@ -226,7 +226,7 @@
 		);
 
 		$this->query_vars = wp_parse_args( $query_vars, $defaults );
-		do_action_ref_array( 'pre_get_comments', array( &$this ) );
+		do_action_ref_array( 'pre_get_comments', array( $this ) );
 		extract( $this->query_vars, EXTR_SKIP );
 
 		// $args can be whatever, only use the args defined in defaults to compute the key
@@ -332,7 +332,7 @@
 		}
 
 		$pieces = array( 'fields', 'join', 'where', 'orderby', 'order', 'limits' );
-		$clauses = apply_filters_ref_array( 'comments_clauses', array( compact( $pieces ), &$this ) );
+		$clauses = apply_filters_ref_array( 'comments_clauses', array( compact( $pieces ), $this ) );
 		foreach ( $pieces as $piece )
 			$$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
 
@@ -342,7 +342,7 @@
 			return $wpdb->get_var( $query );
 
 		$comments = $wpdb->get_results( $query );
-		$comments = apply_filters_ref_array( 'the_comments', array( $comments, &$this ) );
+		$comments = apply_filters_ref_array( 'the_comments', array( $comments, $this ) );
 
 		wp_cache_add( $cache_key, $comments, 'comment' );
 
@@ -1816,7 +1816,7 @@
 		endif;
 	endforeach;
 
-	do_action_ref_array('pre_ping', array(&$post_links, &$pung));
+	do_action_ref_array('pre_ping', array($post_links, $pung));
 
 	foreach ( (array) $post_links as $pagelinkedto ) {
 		$pingback_server_url = discover_pingback_server_uri( $pagelinkedto );
Index: wp-includes/default-widgets.php
===================================================================
--- wp-includes/default-widgets.php	(revision 20117)
+++ wp-includes/default-widgets.php	(working copy)
@@ -542,9 +542,9 @@
 		parent::__construct('recent-posts', __('Recent Posts'), $widget_ops);
 		$this->alt_option_name = 'widget_recent_entries';
 
-		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') );
+		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') );
 	}
 
 	function widget($args, $instance) {
@@ -632,10 +632,10 @@
 		$this->alt_option_name = 'widget_recent_comments';
 
 		if ( is_active_widget(false, false, $this->id_base) )
-			add_action( 'wp_head', array(&$this, 'recent_comments_style') );
+			add_action( 'wp_head', array($this, 'recent_comments_style') );
 
-		add_action( 'comment_post', array(&$this, 'flush_widget_cache') );
-		add_action( 'transition_comment_status', array(&$this, 'flush_widget_cache') );
+		add_action( 'comment_post', array($this, 'flush_widget_cache') );
+		add_action( 'transition_comment_status', array($this, 'flush_widget_cache') );
 	}
 
 	function recent_comments_style() {
Index: wp-includes/feed.php
===================================================================
--- wp-includes/feed.php	(revision 20117)
+++ wp-includes/feed.php	(working copy)
@@ -535,7 +535,7 @@
 	$feed->set_cache_class('WP_Feed_Cache');
 	$feed->set_file_class('WP_SimplePie_File');
 	$feed->set_cache_duration(apply_filters('wp_feed_cache_transient_lifetime', 43200, $url));
-	do_action_ref_array( 'wp_feed_options', array( &$feed, $url ) );
+	do_action_ref_array( 'wp_feed_options', array( $feed, $url ) );
 	$feed->init();
 	$feed->handle_content_type();
 
Index: wp-includes/media.php
===================================================================
--- wp-includes/media.php	(revision 20117)
+++ wp-includes/media.php	(working copy)
@@ -1033,20 +1033,20 @@
 	 */
 	function __construct() {
 		// Hack to get the [embed] shortcode to run before wpautop()
-		add_filter( 'the_content', array(&$this, 'run_shortcode'), 8 );
+		add_filter( 'the_content', array($this, 'run_shortcode'), 8 );
 
 		// Shortcode placeholder for strip_shortcodes()
 		add_shortcode( 'embed', '__return_false' );
 
 		// Attempts to embed all URLs in a post
 		if ( get_option('embed_autourls') )
-			add_filter( 'the_content', array(&$this, 'autoembed'), 8 );
+			add_filter( 'the_content', array($this, 'autoembed'), 8 );
 
 		// After a post is saved, invalidate the oEmbed cache
-		add_action( 'save_post', array(&$this, 'delete_oembed_caches') );
+		add_action( 'save_post', array($this, 'delete_oembed_caches') );
 
 		// After a post is saved, cache oEmbed items via AJAX
-		add_action( 'edit_form_advanced', array(&$this, 'maybe_run_ajax_cache') );
+		add_action( 'edit_form_advanced', array($this, 'maybe_run_ajax_cache') );
 	}
 
 	/**
@@ -1071,7 +1071,7 @@
 		$orig_shortcode_tags = $shortcode_tags;
 		remove_all_shortcodes();
 
-		add_shortcode( 'embed', array(&$this, 'shortcode') );
+		add_shortcode( 'embed', array($this, 'shortcode') );
 
 		// Do the shortcode (only the [embed] one is registered)
 		$content = do_shortcode( $content );
@@ -1261,7 +1261,7 @@
 	 * @return string Potentially modified $content.
 	 */
 	function autoembed( $content ) {
-		return preg_replace_callback( '|^\s*(https?://[^\s"]+)\s*$|im', array(&$this, 'autoembed_callback'), $content );
+		return preg_replace_callback( '|^\s*(https?://[^\s"]+)\s*$|im', array($this, 'autoembed_callback'), $content );
 	}
 
 	/**
Index: wp-includes/nav-menu-template.php
===================================================================
--- wp-includes/nav-menu-template.php	(revision 20117)
+++ wp-includes/nav-menu-template.php	(working copy)
@@ -472,7 +472,7 @@
 	$walker = ( empty($r->walker) ) ? new Walker_Nav_Menu : $r->walker;
 	$args = array( $items, $depth, $r );
 
-	return call_user_func_array( array(&$walker, 'walk'), $args );
+	return call_user_func_array( array($walker, 'walk'), $args );
 }
 
 /**
Index: wp-includes/pluggable.php
===================================================================
--- wp-includes/pluggable.php	(revision 20117)
+++ wp-includes/pluggable.php	(working copy)
@@ -427,7 +427,7 @@
 		}
 	}
 
-	do_action_ref_array( 'phpmailer_init', array( &$phpmailer ) );
+	do_action_ref_array( 'phpmailer_init', array( $phpmailer ) );
 
 	// Send!
 	try {
Index: wp-includes/pomo/mo.php
===================================================================
--- wp-includes/pomo/mo.php	(revision 20117)
+++ wp-includes/pomo/mo.php	(working copy)
@@ -198,7 +198,7 @@
 				$headers = $this->make_headers($translation);
 				$this->set_headers($headers);
 			} else {
-				$entry = &$this->make_entry($original, $translation);
+				$entry = $this->make_entry($original, $translation);
 				$this->entries[$entry->key()] = &$entry;
 			}
 		}
Index: wp-includes/post-template.php
===================================================================
--- wp-includes/post-template.php	(revision 20117)
+++ wp-includes/post-template.php	(working copy)
@@ -948,7 +948,7 @@
 		$walker = $r['walker'];
 
 	$args = array($pages, $depth, $r, $current_page);
-	return call_user_func_array(array(&$walker, 'walk'), $args);
+	return call_user_func_array(array($walker, 'walk'), $args);
 }
 
 /**
@@ -965,7 +965,7 @@
 	else
 		$walker = $args[2]['walker'];
 
-	return call_user_func_array(array(&$walker, 'walk'), $args);
+	return call_user_func_array(array($walker, 'walk'), $args);
 }
 
 /**
Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php	(revision 20117)
+++ wp-includes/post.php	(working copy)
@@ -4265,7 +4265,7 @@
 		$add_seconds_server = date('Z');
 
 		$post_types = get_post_types( array( 'public' => true ) );
-		array_walk( $post_types, array( &$wpdb, 'escape_by_ref' ) );
+		array_walk( $post_types, array( $wpdb, 'escape_by_ref' ) );
 		$post_types = "'" . implode( "', '", $post_types ) . "'";
 
 		switch ( $timezone ) {
Index: wp-includes/query.php
===================================================================
--- wp-includes/query.php	(revision 20117)
+++ wp-includes/query.php	(working copy)
@@ -1671,7 +1671,7 @@
 		$this->query_vars_hash = md5( serialize( $this->query_vars ) );
 		$this->query_vars_changed = false;
 
-		do_action_ref_array('parse_query', array(&$this));
+		do_action_ref_array('parse_query', array($this));
 	}
 
 	/*
@@ -1919,7 +1919,7 @@
 
 		$this->parse_query();
 
-		do_action_ref_array('pre_get_posts', array(&$this));
+		do_action_ref_array('pre_get_posts', array($this));
 
 		// Shorthand.
 		$q = &$this->query_vars;
@@ -2199,7 +2199,7 @@
 		}
 
 		// Allow plugins to contextually add/remove/modify the search section of the database query
-		$search = apply_filters_ref_array('posts_search', array( $search, &$this ) );
+		$search = apply_filters_ref_array('posts_search', array( $search, $this ) );
 
 		// Taxonomies
 		if ( !$this->is_singular ) {
@@ -2502,8 +2502,8 @@
 		// Apply filters on where and join prior to paging so that any
 		// manipulations to them are reflected in the paging by day queries.
 		if ( !$q['suppress_filters'] ) {
-			$where = apply_filters_ref_array('posts_where', array( $where, &$this ) );
-			$join = apply_filters_ref_array('posts_join', array( $join, &$this ) );
+			$where = apply_filters_ref_array('posts_where', array( $where, $this ) );
+			$join = apply_filters_ref_array('posts_join', array( $join, $this ) );
 		}
 
 		// Paging
@@ -2534,11 +2534,11 @@
 			}
 
 			if ( !$q['suppress_filters'] ) {
-				$cjoin = apply_filters_ref_array('comment_feed_join', array( $cjoin, &$this ) );
-				$cwhere = apply_filters_ref_array('comment_feed_where', array( $cwhere, &$this ) );
-				$cgroupby = apply_filters_ref_array('comment_feed_groupby', array( $cgroupby, &$this ) );
-				$corderby = apply_filters_ref_array('comment_feed_orderby', array( 'comment_date_gmt DESC', &$this ) );
-				$climits = apply_filters_ref_array('comment_feed_limits', array( 'LIMIT ' . get_option('posts_per_rss'), &$this ) );
+				$cjoin = apply_filters_ref_array('comment_feed_join', array( $cjoin, $this ) );
+				$cwhere = apply_filters_ref_array('comment_feed_where', array( $cwhere, $this ) );
+				$cgroupby = apply_filters_ref_array('comment_feed_groupby', array( $cgroupby, $this ) );
+				$corderby = apply_filters_ref_array('comment_feed_orderby', array( 'comment_date_gmt DESC', $this ) );
+				$climits = apply_filters_ref_array('comment_feed_limits', array( 'LIMIT ' . get_option('posts_per_rss'), $this ) );
 			}
 			$cgroupby = ( ! empty( $cgroupby ) ) ? 'GROUP BY ' . $cgroupby : '';
 			$corderby = ( ! empty( $corderby ) ) ? 'ORDER BY ' . $corderby : '';
@@ -2564,16 +2564,16 @@
 		// Apply post-paging filters on where and join. Only plugins that
 		// manipulate paging queries should use these hooks.
 		if ( !$q['suppress_filters'] ) {
-			$where		= apply_filters_ref_array( 'posts_where_paged',	array( $where, &$this ) );
-			$groupby	= apply_filters_ref_array( 'posts_groupby',		array( $groupby, &$this ) );
-			$join		= apply_filters_ref_array( 'posts_join_paged',	array( $join, &$this ) );
-			$orderby	= apply_filters_ref_array( 'posts_orderby',		array( $orderby, &$this ) );
-			$distinct	= apply_filters_ref_array( 'posts_distinct',	array( $distinct, &$this ) );
-			$limits		= apply_filters_ref_array( 'post_limits',		array( $limits, &$this ) );
-			$fields		= apply_filters_ref_array( 'posts_fields',		array( $fields, &$this ) );
+			$where		= apply_filters_ref_array( 'posts_where_paged',	array( $where, $this ) );
+			$groupby	= apply_filters_ref_array( 'posts_groupby',		array( $groupby, $this ) );
+			$join		= apply_filters_ref_array( 'posts_join_paged',	array( $join, $this ) );
+			$orderby	= apply_filters_ref_array( 'posts_orderby',		array( $orderby, $this ) );
+			$distinct	= apply_filters_ref_array( 'posts_distinct',	array( $distinct, $this ) );
+			$limits		= apply_filters_ref_array( 'post_limits',		array( $limits, $this ) );
+			$fields		= apply_filters_ref_array( 'posts_fields',		array( $fields, $this ) );
 
 			// Filter all clauses at once, for convenience
-			$clauses = (array) apply_filters_ref_array( 'posts_clauses', array( compact( $pieces ), &$this ) );
+			$clauses = (array) apply_filters_ref_array( 'posts_clauses', array( compact( $pieces ), $this ) );
 			foreach ( $pieces as $piece )
 				$$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
 		}
@@ -2583,16 +2583,16 @@
 
 		// Filter again for the benefit of caching plugins. Regular plugins should use the hooks above.
 		if ( !$q['suppress_filters'] ) {
-			$where		= apply_filters_ref_array( 'posts_where_request',		array( $where, &$this ) );
-			$groupby	= apply_filters_ref_array( 'posts_groupby_request',		array( $groupby, &$this ) );
-			$join		= apply_filters_ref_array( 'posts_join_request',		array( $join, &$this ) );
-			$orderby	= apply_filters_ref_array( 'posts_orderby_request',		array( $orderby, &$this ) );
-			$distinct	= apply_filters_ref_array( 'posts_distinct_request',	array( $distinct, &$this ) );
-			$fields		= apply_filters_ref_array( 'posts_fields_request',		array( $fields, &$this ) );
-			$limits		= apply_filters_ref_array( 'post_limits_request',		array( $limits, &$this ) );
+			$where		= apply_filters_ref_array( 'posts_where_request',		array( $where, $this ) );
+			$groupby	= apply_filters_ref_array( 'posts_groupby_request',		array( $groupby, $this ) );
+			$join		= apply_filters_ref_array( 'posts_join_request',		array( $join, $this ) );
+			$orderby	= apply_filters_ref_array( 'posts_orderby_request',		array( $orderby, $this ) );
+			$distinct	= apply_filters_ref_array( 'posts_distinct_request',	array( $distinct, $this ) );
+			$fields		= apply_filters_ref_array( 'posts_fields_request',		array( $fields, $this ) );
+			$limits		= apply_filters_ref_array( 'post_limits_request',		array( $limits, $this ) );
 
 			// Filter all clauses at once, for convenience
-			$clauses = (array) apply_filters_ref_array( 'posts_clauses_request', array( compact( $pieces ), &$this ) );
+			$clauses = (array) apply_filters_ref_array( 'posts_clauses_request', array( compact( $pieces ), $this ) );
 			foreach ( $pieces as $piece )
 				$$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
 		}
@@ -2609,7 +2609,7 @@
 		$this->request = $old_request = "SELECT $found_rows $distinct $fields FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby $limits";
 
 		if ( !$q['suppress_filters'] ) {
-			$this->request = apply_filters_ref_array( 'posts_request', array( $this->request, &$this ) );
+			$this->request = apply_filters_ref_array( 'posts_request', array( $this->request, $this ) );
 		}
 
 		if ( 'ids' == $q['fields'] ) {
@@ -2654,16 +2654,16 @@
 
 		// Raw results filter. Prior to status checks.
 		if ( !$q['suppress_filters'] )
-			$this->posts = apply_filters_ref_array('posts_results', array( $this->posts, &$this ) );
+			$this->posts = apply_filters_ref_array('posts_results', array( $this->posts, $this ) );
 
 		if ( !empty($this->posts) && $this->is_comment_feed && $this->is_singular ) {
-			$cjoin = apply_filters_ref_array('comment_feed_join', array( '', &$this ) );
-			$cwhere = apply_filters_ref_array('comment_feed_where', array( "WHERE comment_post_ID = '{$this->posts[0]->ID}' AND comment_approved = '1'", &$this ) );
-			$cgroupby = apply_filters_ref_array('comment_feed_groupby', array( '', &$this ) );
+			$cjoin = apply_filters_ref_array('comment_feed_join', array( '', $this ) );
+			$cwhere = apply_filters_ref_array('comment_feed_where', array( "WHERE comment_post_ID = '{$this->posts[0]->ID}' AND comment_approved = '1'", $this ) );
+			$cgroupby = apply_filters_ref_array('comment_feed_groupby', array( '', $this ) );
 			$cgroupby = ( ! empty( $cgroupby ) ) ? 'GROUP BY ' . $cgroupby : '';
-			$corderby = apply_filters_ref_array('comment_feed_orderby', array( 'comment_date_gmt DESC', &$this ) );
+			$corderby = apply_filters_ref_array('comment_feed_orderby', array( 'comment_date_gmt DESC', $this ) );
 			$corderby = ( ! empty( $corderby ) ) ? 'ORDER BY ' . $corderby : '';
-			$climits = apply_filters_ref_array('comment_feed_limits', array( 'LIMIT ' . get_option('posts_per_rss'), &$this ) );
+			$climits = apply_filters_ref_array('comment_feed_limits', array( 'LIMIT ' . get_option('posts_per_rss'), $this ) );
 			$comments_request = "SELECT $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby $corderby $climits";
 			$this->comments = $wpdb->get_results($comments_request);
 			$this->comment_count = count($this->comments);
@@ -2698,7 +2698,7 @@
 			}
 
 			if ( $this->is_preview && $this->posts && current_user_can( $edit_cap, $this->posts[0]->ID ) )
-				$this->posts[0] = apply_filters_ref_array('the_preview', array( $this->posts[0], &$this ));
+				$this->posts[0] = apply_filters_ref_array('the_preview', array( $this->posts[0], $this ));
 		}
 
 		// Put sticky posts at the top of the posts array
@@ -2752,7 +2752,7 @@
 		}
 
 		if ( !$q['suppress_filters'] )
-			$this->posts = apply_filters_ref_array('the_posts', array( $this->posts, &$this ) );
+			$this->posts = apply_filters_ref_array('the_posts', array( $this->posts, $this ) );
 
 		$this->post_count = count($this->posts);
 
@@ -2777,8 +2777,8 @@
 		if ( $q['no_found_rows'] || empty( $limits ) )
 			return;
 
-		$this->found_posts = $wpdb->get_var( apply_filters_ref_array( 'found_posts_query', array( 'SELECT FOUND_ROWS()', &$this ) ) );
-		$this->found_posts = apply_filters_ref_array( 'found_posts', array( $this->found_posts, &$this ) );
+		$this->found_posts = $wpdb->get_var( apply_filters_ref_array( 'found_posts_query', array( 'SELECT FOUND_ROWS()', $this ) ) );
+		$this->found_posts = apply_filters_ref_array( 'found_posts', array( $this->found_posts, $this ) );
 
 		$this->max_num_pages = ceil( $this->found_posts / $q['posts_per_page'] );
 	}
@@ -2815,7 +2815,7 @@
 		$this->in_the_loop = true;
 
 		if ( $this->current_post == -1 ) // loop has just started
-			do_action_ref_array('loop_start', array(&$this));
+			do_action_ref_array('loop_start', array($this));
 
 		$post = $this->next_post();
 		setup_postdata($post);
@@ -2836,7 +2836,7 @@
 		if ( $this->current_post + 1 < $this->post_count ) {
 			return true;
 		} elseif ( $this->current_post + 1 == $this->post_count && $this->post_count > 0 ) {
-			do_action_ref_array('loop_end', array(&$this));
+			do_action_ref_array('loop_end', array($this));
 			// Do some cleaning up after the loop
 			$this->rewind_posts();
 		}
@@ -3614,7 +3614,7 @@
 		$multipage = 0;
 	}
 
-	do_action_ref_array('the_post', array(&$post));
+	do_action_ref_array('the_post', array($post));
 
 	return true;
 }
Index: wp-includes/rewrite.php
===================================================================
--- wp-includes/rewrite.php	(revision 20117)
+++ wp-includes/rewrite.php	(working copy)
@@ -1588,7 +1588,7 @@
 		else
 			$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $old_feed_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
 
-		do_action_ref_array('generate_rewrite_rules', array(&$this));
+		do_action_ref_array('generate_rewrite_rules', array($this));
 		$this->rules = apply_filters('rewrite_rules_array', $this->rules);
 
 		return $this->rules;
Index: wp-includes/Text/Diff/Renderer/inline.php
===================================================================
--- wp-includes/Text/Diff/Renderer/inline.php	(revision 20117)
+++ wp-includes/Text/Diff/Renderer/inline.php	(working copy)
@@ -103,7 +103,7 @@
     function _lines($lines, $prefix = ' ', $encode = true)
     {
         if ($encode) {
-            array_walk($lines, array(&$this, '_encode'));
+            array_walk($lines, array($this, '_encode'));
         }
 
         if ($this->_split_level == 'lines') {
@@ -115,7 +115,7 @@
 
     function _added($lines)
     {
-        array_walk($lines, array(&$this, '_encode'));
+        array_walk($lines, array($this, '_encode'));
         $lines[0] = $this->_ins_prefix . $lines[0];
         $lines[count($lines) - 1] .= $this->_ins_suffix;
         return $this->_lines($lines, ' ', false);
@@ -123,7 +123,7 @@
 
     function _deleted($lines, $words = false)
     {
-        array_walk($lines, array(&$this, '_encode'));
+        array_walk($lines, array($this, '_encode'));
         $lines[0] = $this->_del_prefix . $lines[0];
         $lines[count($lines) - 1] .= $this->_del_suffix;
         return $this->_lines($lines, ' ', false);
Index: wp-includes/theme.php
===================================================================
--- wp-includes/theme.php	(revision 20117)
+++ wp-includes/theme.php	(working copy)
@@ -1118,7 +1118,7 @@
 
 	require_once( ABSPATH . 'wp-admin/custom-header.php' );
 	$custom_image_header = new Custom_Image_Header( $admin_header_callback, $admin_image_div_callback );
-	add_action( 'admin_menu', array( &$custom_image_header, 'init' ) );
+	add_action( 'admin_menu', array( $custom_image_header, 'init' ) );
 }
 
 /**
@@ -1139,7 +1139,7 @@
 	remove_theme_support( 'custom-header-uploads' );
 
 	if ( is_admin() ) {
-		remove_action( 'admin_menu', array( &$GLOBALS['custom_image_header'], 'init' ) );
+		remove_action( 'admin_menu', array( $GLOBALS['custom_image_header'], 'init' ) );
 		unset( $GLOBALS['custom_image_header'] );
 	}
 
@@ -1258,7 +1258,7 @@
 		return;
 	require_once( ABSPATH . 'wp-admin/custom-background.php' );
 	$GLOBALS['custom_background'] = new Custom_Background( $admin_header_callback, $admin_image_div_callback );
-	add_action( 'admin_menu', array( &$GLOBALS['custom_background'], 'init' ) );
+	add_action( 'admin_menu', array( $GLOBALS['custom_background'], 'init' ) );
 }
 
 /**
@@ -1278,7 +1278,7 @@
 	_remove_theme_support( 'custom-background' );
 
 	if ( is_admin() ) {
-		remove_action( 'admin_menu', array( &$GLOBALS['custom_background'], 'init' ) );
+		remove_action( 'admin_menu', array( $GLOBALS['custom_background'], 'init' ) );
 		unset( $GLOBALS['custom_background'] );
 	}
 
Index: wp-includes/user.php
===================================================================
--- wp-includes/user.php	(revision 20117)
+++ wp-includes/user.php	(working copy)
@@ -38,7 +38,7 @@
 		$credentials['remember'] = false;
 
 	// TODO do we deprecate the wp_authentication action?
-	do_action_ref_array('wp_authenticate', array(&$credentials['user_login'], &$credentials['user_password']));
+	do_action_ref_array('wp_authenticate', array($credentials['user_login'], $credentials['user_password']));
 
 	if ( '' === $secure_cookie )
 		$secure_cookie = is_ssl();
@@ -402,7 +402,7 @@
 	function prepare_query() {
 		global $wpdb;
 
-		$qv = &$this->query_vars;
+		$qv = $this->query_vars;
 
 		if ( is_array( $qv['fields'] ) ) {
 			$qv['fields'] = array_unique( $qv['fields'] );
@@ -537,7 +537,7 @@
 			$this->query_where .= " AND $wpdb->users.ID NOT IN ($ids)";
 		}
 
-		do_action_ref_array( 'pre_user_query', array( &$this ) );
+		do_action_ref_array( 'pre_user_query', array( $this ) );
 	}
 
 	/**
Index: wp-includes/widgets.php
===================================================================
--- wp-includes/widgets.php	(revision 20117)
+++ wp-includes/widgets.php	(working copy)
@@ -152,15 +152,15 @@
 	}
 
 	function _get_display_callback() {
-		return array(&$this, 'display_callback');
+		return array($this, 'display_callback');
 	}
 
 	function _get_update_callback() {
-		return array(&$this, 'update_callback');
+		return array($this, 'update_callback');
 	}
 
 	function _get_form_callback() {
-		return array(&$this, 'form_callback');
+		return array($this, 'form_callback');
 	}
 
 	/** Generate the actual widget content.
@@ -270,7 +270,7 @@
 			$return = $this->form($instance);
 			// add extra fields in the widget form - be sure to set $return to null if you add any
 			// if the widget has no form the text echoed from the default form method can be hidden using css
-			do_action_ref_array( 'in_widget_form', array(&$this, &$return, $instance) );
+			do_action_ref_array( 'in_widget_form', array($this, $return, $instance) );
 		}
 		return $return;
 	}
@@ -317,7 +317,7 @@
 	var $widgets = array();
 
 	function WP_Widget_Factory() {
-		add_action( 'widgets_init', array( &$this, '_register_widgets' ), 100 );
+		add_action( 'widgets_init', array( $this, '_register_widgets' ), 100 );
 	}
 
 	function register($widget_class) {
Index: wp-includes/wp-db.php
===================================================================
--- wp-includes/wp-db.php	(revision 20117)
+++ wp-includes/wp-db.php	(working copy)
@@ -488,7 +488,7 @@
 	 * @param string $dbhost MySQL database host
 	 */
 	function __construct( $dbuser, $dbpassword, $dbname, $dbhost ) {
-		register_shutdown_function( array( &$this, '__destruct' ) );
+		register_shutdown_function( array( $this, '__destruct' ) );
 
 		if ( WP_DEBUG )
 			$this->show_errors();
@@ -901,7 +901,7 @@
 		$query = str_replace( "'%s'", '%s', $query ); // in case someone mistakenly already singlequoted it
 		$query = str_replace( '"%s"', '%s', $query ); // doublequote unquoting
 		$query = preg_replace( '|(?<!%)%s|', "'%s'", $query ); // quote the strings, avoiding escaped strings like %%s
-		array_walk( $args, array( &$this, 'escape_by_ref' ) );
+		array_walk( $args, array( $this, 'escape_by_ref' ) );
 		return @vsprintf( $query, $args );
 	}
 
Index: wp-includes/wp-diff.php
===================================================================
--- wp-includes/wp-diff.php	(revision 20117)
+++ wp-includes/wp-diff.php	(working copy)
@@ -422,7 +422,7 @@
 		$chars2 = count_chars($string2);
 
 		// L1-norm of difference vector.
-		$difference = array_sum( array_map( array(&$this, 'difference'), $chars1, $chars2 ) );
+		$difference = array_sum( array_map( array($this, 'difference'), $chars1, $chars2 ) );
 
 		// $string1 has zero length? Odd. Give huge penalty by not dividing.
 		if ( !$string1 )