Make WordPress Core

Changeset 27057


Ignore:
Timestamp:
01/29/2014 06:45:54 AM (10 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/comment.php

    r27055 r27057  
    136136function get_comment(&$comment, $output = OBJECT) {
    137137    global $wpdb;
    138     $null = null;
    139138
    140139    if ( empty($comment) ) {
     
    152151            $_comment = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_ID = %d LIMIT 1", $comment));
    153152            if ( ! $_comment )
    154                 return $null;
     153                return null;
    155154            wp_cache_add($_comment->comment_ID, $_comment, 'comment');
    156155        }
  • trunk/src/wp-includes/revision.php

    r26995 r27057  
    257257 */
    258258function wp_get_post_revision(&$post, $output = OBJECT, $filter = 'raw') {
    259     $null = null;
    260259    if ( !$revision = get_post( $post, OBJECT, $filter ) )
    261260        return $revision;
    262261    if ( 'revision' !== $revision->post_type )
    263         return $null;
     262        return null;
    264263
    265264    if ( $output == OBJECT ) {
  • trunk/src/wp-includes/taxonomy.php

    r26912 r27057  
    936936function get_term($term, $taxonomy, $output = OBJECT, $filter = 'raw') {
    937937    global $wpdb;
    938     $null = null;
    939938
    940939    if ( empty($term) ) {
     
    955954            $term = $term->term_id;
    956955        if ( !$term = (int) $term )
    957             return $null;
     956            return null;
    958957        if ( ! $_term = wp_cache_get($term, $taxonomy) ) {
    959958            $_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) );
    960959            if ( ! $_term )
    961                 return $null;
     960                return null;
    962961            wp_cache_add($term, $_term, $taxonomy);
    963962        }
Note: See TracChangeset for help on using the changeset viewer.