Index: wp-includes/post-template.php =================================================================== --- wp-includes/post-template.php (revision 21801) +++ wp-includes/post-template.php (working copy) @@ -934,7 +934,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); } /** @@ -951,7 +951,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/nav-menu-template.php =================================================================== --- wp-includes/nav-menu-template.php (revision 21801) +++ wp-includes/nav-menu-template.php (working copy) @@ -469,7 +469,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/category.php =================================================================== --- wp-includes/category.php (revision 21801) +++ wp-includes/category.php (working copy) @@ -185,7 +185,7 @@ */ function get_cat_name( $cat_id ) { $cat_id = (int) $cat_id; - $category = &get_category( $cat_id ); + $category = get_category( $cat_id ); if ( ! $category || is_wp_error( $category ) ) return ''; return $category->name; @@ -319,18 +319,18 @@ */ function _make_cat_compat( &$category ) { if ( is_object( $category ) ) { - $category->cat_ID = &$category->term_id; - $category->category_count = &$category->count; - $category->category_description = &$category->description; - $category->cat_name = &$category->name; - $category->category_nicename = &$category->slug; - $category->category_parent = &$category->parent; + $category->cat_ID = $category->term_id; + $category->category_count = $category->count; + $category->category_description = $category->description; + $category->cat_name = $category->name; + $category->category_nicename = $category->slug; + $category->category_parent = $category->parent; } elseif ( is_array( $category ) && isset( $category['term_id'] ) ) { - $category['cat_ID'] = &$category['term_id']; - $category['category_count'] = &$category['count']; - $category['category_description'] = &$category['description']; - $category['cat_name'] = &$category['name']; - $category['category_nicename'] = &$category['slug']; - $category['category_parent'] = &$category['parent']; + $category['cat_ID'] = $category['term_id']; + $category['category_count'] = $category['count']; + $category['category_description'] = $category['description']; + $category['cat_name'] = $category['name']; + $category['category_nicename'] = $category['slug']; + $category['category_parent'] = $category['parent']; } } Index: wp-includes/taxonomy.php =================================================================== --- wp-includes/taxonomy.php (revision 21801) +++ wp-includes/taxonomy.php (working copy) @@ -1408,7 +1408,7 @@ if ( $child_of ) { $children = _get_term_hierarchy($taxonomies[0]); if ( ! empty($children) ) - $terms = & _get_term_children($child_of, $terms, $taxonomies[0]); + $terms = _get_term_children($child_of, $terms, $taxonomies[0]); } // Update term counts to include children. @@ -2981,9 +2981,9 @@ if ( !is_object($term) ) { if ( is_int($term) ) { - $term = &get_term($term, $taxonomy); + $term = get_term($term, $taxonomy); } else { - $term = &get_term_by('slug', $term, $taxonomy); + $term = get_term_by('slug', $term, $taxonomy); } } Index: wp-includes/class-http.php =================================================================== --- wp-includes/class-http.php (revision 21801) +++ wp-includes/class-http.php (working copy) @@ -1113,7 +1113,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 ); Index: wp-includes/post.php =================================================================== --- wp-includes/post.php (revision 21801) +++ wp-includes/post.php (working copy) @@ -3655,7 +3655,7 @@ update_post_cache( $pages ); if ( $child_of || $hierarchical ) - $pages = & get_page_children($child_of, $pages); + $pages = get_page_children($child_of, $pages); if ( !empty($exclude_tree) ) { $exclude = (int) $exclude_tree; Index: wp-includes/default-widgets.php =================================================================== --- wp-includes/default-widgets.php (revision 21801) +++ wp-includes/default-widgets.php (working copy) @@ -536,9 +536,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) { @@ -626,10 +626,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/wp-diff.php =================================================================== --- wp-includes/wp-diff.php (revision 21801) +++ 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 ) Index: wp-includes/l10n.php =================================================================== --- wp-includes/l10n.php (revision 21801) +++ wp-includes/l10n.php (working copy) @@ -65,7 +65,7 @@ * @return string Translated text */ function translate( $text, $domain = 'default' ) { - $translations = &get_translations_for_domain( $domain ); + $translations = get_translations_for_domain( $domain ); return apply_filters( 'gettext', $translations->translate( $text ), $text, $domain ); } @@ -78,7 +78,7 @@ } function translate_with_gettext_context( $text, $context, $domain = 'default' ) { - $translations = &get_translations_for_domain( $domain ); + $translations = get_translations_for_domain( $domain ); return apply_filters( 'gettext_with_context', $translations->translate( $text, $context ), $text, $context, $domain ); } @@ -236,7 +236,7 @@ * @return string Either $single or $plural translated text */ function _n( $single, $plural, $number, $domain = 'default' ) { - $translations = &get_translations_for_domain( $domain ); + $translations = get_translations_for_domain( $domain ); $translation = $translations->translate_plural( $single, $plural, $number ); return apply_filters( 'ngettext', $translation, $single, $plural, $number, $domain ); } @@ -249,7 +249,7 @@ * */ function _nx($single, $plural, $number, $context, $domain = 'default') { - $translations = &get_translations_for_domain( $domain ); + $translations = get_translations_for_domain( $domain ); $translation = $translations->translate_plural( $single, $plural, $number, $context ); return apply_filters( 'ngettext_with_context', $translation, $single, $plural, $number, $context, $domain ); } Index: wp-includes/comment-template.php =================================================================== --- wp-includes/comment-template.php (revision 21801) +++ wp-includes/comment-template.php (working copy) @@ -894,7 +894,7 @@ update_comment_cache($wp_query->comments); if ( $separate_comments ) { - $wp_query->comments_by_type = &separate_comments($comments); + $wp_query->comments_by_type = separate_comments($comments); $comments_by_type = &$wp_query->comments_by_type; } @@ -1428,7 +1428,7 @@ if ( empty($comments) ) return; if ( 'all' != $r['type'] ) { - $comments_by_type = &separate_comments($comments); + $comments_by_type = separate_comments($comments); if ( empty($comments_by_type[$r['type']]) ) return; $_comments = $comments_by_type[$r['type']]; @@ -1440,7 +1440,7 @@ return; if ( 'all' != $r['type'] ) { if ( empty($wp_query->comments_by_type) ) - $wp_query->comments_by_type = &separate_comments($wp_query->comments); + $wp_query->comments_by_type = separate_comments($wp_query->comments); if ( empty($wp_query->comments_by_type[$r['type']]) ) return; $_comments = $wp_query->comments_by_type[$r['type']]; Index: wp-includes/media.php =================================================================== --- wp-includes/media.php (revision 21801) +++ wp-includes/media.php (working copy) @@ -1054,20 +1054,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') ); } /** @@ -1092,7 +1092,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 ); @@ -1282,7 +1282,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/cache.php =================================================================== --- wp-includes/cache.php (revision 21801) +++ wp-includes/cache.php (working copy) @@ -623,7 +623,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/link-template.php =================================================================== --- wp-includes/link-template.php (revision 21801) +++ wp-includes/link-template.php (working copy) @@ -974,7 +974,7 @@ * @return string */ function get_edit_comment_link( $comment_id = 0 ) { - $comment = &get_comment( $comment_id ); + $comment = get_comment( $comment_id ); if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) return; Index: wp-includes/wp-db.php =================================================================== --- wp-includes/wp-db.php (revision 21801) +++ wp-includes/wp-db.php (working copy) @@ -534,7 +534,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(); @@ -1000,7 +1000,7 @@ $query = str_replace( '"%s"', '%s', $query ); // doublequote unquoting $query = str_replace( '%f' , '%F', $query ); // Force floats to be locale unaware $query = preg_replace( '|(?$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 21801) +++ wp-includes/class-wp.php (working copy) @@ -604,7 +604,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/capabilities.php =================================================================== --- wp-includes/capabilities.php (revision 21801) +++ wp-includes/capabilities.php (working copy) @@ -725,7 +725,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(); @@ -1317,7 +1317,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 ); } /** @@ -1339,7 +1339,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/class-oembed.php =================================================================== --- wp-includes/class-oembed.php (revision 21801) +++ 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/widgets.php =================================================================== --- wp-includes/widgets.php (revision 21801) +++ 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. @@ -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/category-template.php =================================================================== --- wp-includes/category-template.php (revision 21801) +++ wp-includes/category-template.php (working copy) @@ -41,7 +41,7 @@ */ function get_category_parents( $id, $link = false, $separator = '/', $nicename = false, $visited = array() ) { $chain = ''; - $parent = &get_category( $id ); + $parent = get_category( $id ); if ( is_wp_error( $parent ) ) return $parent; @@ -135,7 +135,7 @@ */ function get_the_category_by_ID( $cat_ID ) { $cat_ID = (int) $cat_ID; - $category = &get_category( $cat_ID ); + $category = get_category( $cat_ID ); if ( is_wp_error( $category ) ) return $category; return $category->name; @@ -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-admin/includes/ajax-actions.php =================================================================== --- wp-admin/includes/ajax-actions.php (revision 21801) +++ wp-admin/includes/ajax-actions.php (working copy) @@ -331,7 +331,7 @@ $term_id = $parent->term_id; while ( $parent->parent ) { // get the top parent - $parent = &get_term( $parent->parent, $taxonomy->name ); + $parent = get_term( $parent->parent, $taxonomy->name ); if ( is_wp_error( $parent ) ) break; $term_id = $parent->term_id;