Changeset 27057

Timestamp:

01/29/2014 06:45:54 AM (11 years ago)

Author:

wonderboymusic

Message:

get_comment(), wp_get_post_revision(), and get_term() all used to return by reference. Because of this, $null was set to null so the return value would be a variable where applicable. This has not been necessary since [21792], so the $nulls have been removed.

Props toszcze.
Fixes #24768.

Location:

trunk/src/wp-includes

Files:

• comment.php (modified) (2 diffs)
• revision.php (modified) (1 diff)
• taxonomy.php (modified) (2 diffs)

trunk/src/wp-includes/comment.php

@@ -136 +136 @@
 function get_comment(&$comment, $output = OBJECT) {
     global $wpdb;
-    $null = null;
 
     if ( empty($comment) ) {
@@ -152 +151 @@
             $_comment = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_ID = %d LIMIT 1", $comment));
             if ( ! $_comment )
-                return $null;
+                return null;
             wp_cache_add($_comment->comment_ID, $_comment, 'comment');
         }

trunk/src/wp-includes/revision.php

@@ -257 +257 @@
  */
 function wp_get_post_revision(&$post, $output = OBJECT, $filter = 'raw') {
-    $null = null;
     if ( !$revision = get_post( $post, OBJECT, $filter ) )
         return $revision;
     if ( 'revision' !== $revision->post_type )
-        return $null;
+        return null;
 
     if ( $output == OBJECT ) {

trunk/src/wp-includes/taxonomy.php

@@ -936 +936 @@
 function get_term($term, $taxonomy, $output = OBJECT, $filter = 'raw') {
     global $wpdb;
-    $null = null;
 
     if ( empty($term) ) {
@@ -955 +954 @@
             $term = $term->term_id;
         if ( !$term = (int) $term )
-            return $null;
+            return null;
         if ( ! $_term = wp_cache_get($term, $taxonomy) ) {
             $_term = $wpdb->get_row( $wpdb->prepare( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy = %s AND t.term_id = %d LIMIT 1", $taxonomy, $term) );
             if ( ! $_term )
-                return $null;
+                return null;
             wp_cache_add($term, $_term, $taxonomy);
         }