Changeset 5285

Show
Ignore:
Timestamp:
04/19/07 02:53:19 (1 year ago)
Author:
rob1n
Message:

Replace deprecated get_settings() calls with get_option(). Props johnbillion. fixes #4167

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-includes/query.php

    r5171 r5285  
    10611061            $cgroupby = apply_filters('comment_feed_groupby', $cgroupby); 
    10621062 
    1063             $this->comments = (array) $wpdb->get_results("SELECT $distinct $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby ORDER BY comment_date_gmt DESC LIMIT " . get_settings('posts_per_rss')); 
     1063            $this->comments = (array) $wpdb->get_results("SELECT $distinct $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby ORDER BY comment_date_gmt DESC LIMIT " . get_option('posts_per_rss')); 
    10641064            $this->comment_count = count($this->comments); 
    10651065 
    …… 
    11001100            $cjoin = apply_filters('comment_feed_join', ''); 
    11011101            $cwhere = apply_filters('comment_feed_where', "WHERE comment_post_ID = {$this->posts[0]->ID} AND comment_approved = '1'"); 
    1102             $comments_request = "SELECT $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere ORDER BY comment_date_gmt DESC LIMIT " . get_settings('posts_per_rss'); 
     1102            $comments_request = "SELECT $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere ORDER BY comment_date_gmt DESC LIMIT " . get_option('posts_per_rss'); 
    11031103            $this->comments = $wpdb->get_results($comments_request); 
    11041104            $this->comment_count = count($this->comments); 

  • trunk/wp-login.php

    r5089 r5285  
    196196        // send a copy of password change notification to the admin 
    197197        // but check to see if it's the admin whose password we're changing, and skip this 
    198         if ($user->user_email != get_settings('admin_email')) { 
     198        if ($user->user_email != get_option('admin_email')) { 
    199199            $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n"; 
    200200            wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_option('blogname')), $message);