Ticket #4167: 4167.diff

File 4167.diff, 2.1 KB (added by johnbillion, 6 years ago)

Replace references to get_settings with get_option

Line 
1Index: wp-includes/query.php
2===================================================================
3--- wp-includes/query.php       (revision 5283)
4+++ wp-includes/query.php       (working copy)
5@@ -1060,7 +1060,7 @@
6                        $cwhere = apply_filters('comment_feed_where', $cwhere);
7                        $cgroupby = apply_filters('comment_feed_groupby', $cgroupby);
8 
9-                       $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'));
10+                       $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'));
11                        $this->comment_count = count($this->comments);
12 
13                        $post_ids = array();
14@@ -1099,7 +1099,7 @@
15                if ( $this->is_comment_feed && $this->is_singular ) {
16                        $cjoin = apply_filters('comment_feed_join', '');
17                        $cwhere = apply_filters('comment_feed_where', "WHERE comment_post_ID = {$this->posts[0]->ID} AND comment_approved = '1'");
18-                       $comments_request = "SELECT $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere ORDER BY comment_date_gmt DESC LIMIT " . get_settings('posts_per_rss');
19+                       $comments_request = "SELECT $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere ORDER BY comment_date_gmt DESC LIMIT " . get_option('posts_per_rss');
20                        $this->comments = $wpdb->get_results($comments_request);
21                        $this->comment_count = count($this->comments);
22                }
23Index: wp-login.php
24===================================================================
25--- wp-login.php        (revision 5283)
26+++ wp-login.php        (working copy)
27@@ -195,7 +195,7 @@
28        } else {
29                // send a copy of password change notification to the admin
30                // but check to see if it's the admin whose password we're changing, and skip this
31-               if ($user->user_email != get_settings('admin_email')) {
32+               if ($user->user_email != get_option('admin_email')) {
33                        $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
34                        wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_option('blogname')), $message);
35                }