Changeset 21792

Timestamp:

09/10/2012 05:00:11 PM (14 years ago)

Author:

ryan

Message:

Remove unnecessary return by refs. Props wonderboymusic. fixes #21839

Location:

trunk/wp-includes

Files:

• category.php (modified) (4 diffs)
• class-oembed.php (modified) (1 diff)
• comment.php (modified) (2 diffs)
• http.php (modified) (1 diff)
• l10n.php (modified) (1 diff)
• pomo/mo.php (modified) (1 diff)
• post.php (modified) (4 diffs)
• query.php (modified) (3 diffs)
• taxonomy.php (modified) (4 diffs)

trunk/wp-includes/category.php

@@ -37 +37 @@
  * @return array List of categories.
  */
-function &get_categories( $args = '' ) {
+function get_categories( $args = '' ) {
         $defaults = array( 'taxonomy' => 'category' );
         $args = wp_parse_args( $args, $defaults );
@@ -79 +79 @@
  * @return mixed Category data in type defined by $output parameter.
  */
-function &get_category( $category, $output = OBJECT, $filter = 'raw' ) {
+function get_category( $category, $output = OBJECT, $filter = 'raw' ) {
         $category = get_term( $category, 'category', $output, $filter );
         if ( is_wp_error( $category ) )
@@ -250 +250 @@
  * @return array List of tags.
  */
-function &get_tags( $args = '' ) {
+function get_tags( $args = '' ) {
         $tags = get_terms( 'post_tag', $args );
 
@@ -281 +281 @@
  * @return object|array Return type based on $output value.
  */
-function &get_tag( $tag, $output = OBJECT, $filter = 'raw' ) {
+function get_tag( $tag, $output = OBJECT, $filter = 'raw' ) {
         return get_term( $tag, 'post_tag', $output, $filter );
 }

trunk/wp-includes/class-oembed.php

@@ -297 +297 @@
  * @return WP_oEmbed object.
  */
-function &_wp_oembed_get_object() {
+function _wp_oembed_get_object() {
         static $wp_oembed;
 

trunk/wp-includes/comment.php

@@ -128 +128 @@
  * @return object|array|null Depends on $output value.
  */
-function &get_comment(&$comment, $output = OBJECT) {
+function get_comment(&$comment, $output = OBJECT) {
         global $wpdb;
         $null = null;
@@ -724 +724 @@
  * @return array Array of comments keyed by comment_type.
  */
-function &separate_comments(&$comments) {
+function separate_comments(&$comments) {
         $comments_by_type = array('comment' => array(), 'trackback' => array(), 'pingback' => array(), 'pings' => array());
         $count = count($comments);

trunk/wp-includes/http.php

@@ -20 +20 @@
  * @return WP_Http HTTP Transport object.
  */
-function &_wp_http_get_object() {
+function _wp_http_get_object() {
         static $http;
 

trunk/wp-includes/l10n.php

@@ -494 +494 @@
  * @return object A Translation instance
  */
-function &get_translations_for_domain( $domain ) {
+function get_translations_for_domain( $domain ) {
         global $l10n;
         if ( !isset( $l10n[$domain] ) ) {

trunk/wp-includes/pomo/mo.php

@@ -216 +216 @@
          *      0x00 as a plural translations separator
          */
-        function &make_entry($original, $translation) {
+        function make_entry($original, $translation) {
                 $entry = new Translation_Entry();
                 // look for context

trunk/wp-includes/post.php

@@ -3371 +3371 @@
  * @return array
  */
-function &get_page_children($page_id, $pages) {
+function get_page_children($page_id, $pages) {
         $page_list = array();
         foreach ( (array) $pages as $page ) {
@@ -3395 +3395 @@
  * @return array A list arranged by hierarchy. Children immediately follow their parents.
  */
-function &get_page_hierarchy( &$pages, $page_id = 0 ) {
+function get_page_hierarchy( &$pages, $page_id = 0 ) {
         if ( empty( $pages ) ) {
                 $result = array();
@@ -3463 +3463 @@
  * @return array List of pages matching defaults or $args
  */
-function &get_pages($args = '') {
+function get_pages($args = '') {
         global $wpdb;
 
@@ -4951 +4951 @@
  * @return mixed Null if error or post object if success
  */
-function &wp_get_post_revision(&$post, $output = OBJECT, $filter = 'raw') {
+function wp_get_post_revision(&$post, $output = OBJECT, $filter = 'raw') {
         $null = null;
         if ( !$revision = get_post( $post, OBJECT, $filter ) )

trunk/wp-includes/query.php

@@ -87 +87 @@
  * @return array List of posts
  */
-function &query_posts($query) {
+function query_posts($query) {
         unset($GLOBALS['wp_query']);
         $GLOBALS['wp_query'] = new WP_Query();
@@ -1917 +1917 @@
          * @return array List of posts.
          */
-        function &get_posts() {
+        function get_posts() {
                 global $wpdb, $user_ID, $_wp_using_ext_object_cache;
 
@@ -2937 +2937 @@
          * @return array List of posts.
          */
-        function &query( $query ) {
+        function query( $query ) {
                 $this->init();
                 $this->query = $this->query_vars = wp_parse_args( $query );

trunk/wp-includes/taxonomy.php

@@ -862 +862 @@
  * exist then WP_Error will be returned.
  */
-function &get_term($term, $taxonomy, $output = OBJECT, $filter = 'raw') {
+function get_term($term, $taxonomy, $output = OBJECT, $filter = 'raw') {
         global $wpdb;
         $null = null;
@@ -1179 +1179 @@
  * @return array|WP_Error List of Term Objects and their children. Will return WP_Error, if any of $taxonomies do not exist.
  */
-function &get_terms($taxonomies, $args = '') {
+function get_terms($taxonomies, $args = '') {
         global $wpdb;
         $empty_array = array();
@@ -2638 +2638 @@
  * @return bool|array Empty array if $terms found, but not $taxonomy. False if nothing is in cache for $taxonomy and $id.
  */
-function &get_object_term_cache($id, $taxonomy) {
+function get_object_term_cache($id, $taxonomy) {
         $cache = wp_cache_get($id, "{$taxonomy}_relationships");
         return $cache;
@@ -2784 +2784 @@
  * @return array The subset of $terms that are descendants of $term_id.
  */
-function &_get_term_children($term_id, $terms, $taxonomy) {
+function _get_term_children($term_id, $terms, $taxonomy) {
         $empty_array = array();
         if ( empty($terms) )