Changeset 5285
- Timestamp:
- 04/19/2007 02:53:19 AM (18 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-includes/query.php
r5171 r5285 1061 1061 $cgroupby = apply_filters('comment_feed_groupby', $cgroupby); 1062 1062 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')); 1064 1064 $this->comment_count = count($this->comments); 1065 1065 … … 1100 1100 $cjoin = apply_filters('comment_feed_join', ''); 1101 1101 $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'); 1103 1103 $this->comments = $wpdb->get_results($comments_request); 1104 1104 $this->comment_count = count($this->comments); -
trunk/wp-login.php
r5089 r5285 196 196 // send a copy of password change notification to the admin 197 197 // 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')) { 199 199 $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n"; 200 200 wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_option('blogname')), $message);
Note: See TracChangeset
for help on using the changeset viewer.