Wordpress 3.6

[autoinstalls/wordpress.git] / wp-includes / pluggable.php

diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index 83afefab805df6f7dc921aeb48b630169025be27..acfa2ddd77ac61cfd67ba2fbe2761e9d4b9a6984 100644 (file)
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -448,12 +448,10 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
 
        // Send!
        try {
-               $phpmailer->Send();
+               return $phpmailer->Send();
        } catch ( phpmailerException $e ) {
                return false;
        }
-
-       return true;
 }
 endif;
 
@@ -651,9 +649,9 @@ if ( !function_exists('wp_set_auth_cookie') ) :
  */
 function wp_set_auth_cookie($user_id, $remember = false, $secure = '') {
        if ( $remember ) {
-               $expiration = $expire = time() + apply_filters('auth_cookie_expiration', 1209600, $user_id, $remember);
+               $expiration = $expire = time() + apply_filters('auth_cookie_expiration', 14 * DAY_IN_SECONDS, $user_id, $remember);
        } else {
-               $expiration = time() + apply_filters('auth_cookie_expiration', 172800, $user_id, $remember);
+               $expiration = time() + apply_filters('auth_cookie_expiration', 2 * DAY_IN_SECONDS, $user_id, $remember);
                $expire = 0;
        }
 
@@ -816,7 +814,8 @@ function check_admin_referer($action = -1, $query_arg = '_wpnonce') {
        }
        do_action('check_admin_referer', $action, $result);
        return $result;
-}endif;
+}
+endif;
 
 if ( !function_exists('check_ajax_referer') ) :
 /**
@@ -998,6 +997,10 @@ function wp_notify_postauthor( $comment_id, $comment_type = '' ) {
        if ( $post->post_author == get_current_user_id() )
                return false;
 
+       // The post author is no longer a member of the blog
+       if ( ! user_can( $post->post_author, 'read_post', $post->ID ) )
+               return false;
+
        // If there's no email to send the comment to
        if ( '' == $author->user_email )
                return false;
@@ -1042,11 +1045,14 @@ function wp_notify_postauthor( $comment_id, $comment_type = '' ) {
        }
        $notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n";
        $notify_message .= sprintf( __('Permalink: %s'), get_permalink( $comment->comment_post_ID ) . '#comment-' . $comment_id ) . "\r\n";
-       if ( EMPTY_TRASH_DAYS )
-               $notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&c=$comment_id") ) . "\r\n";
-       else
-               $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&c=$comment_id") ) . "\r\n";
-       $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=spam&c=$comment_id") ) . "\r\n";
+
+       if ( user_can( $post->post_author, 'edit_comment', $comment_id ) ) {
+               if ( EMPTY_TRASH_DAYS )
+                       $notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&c=$comment_id") ) . "\r\n";
+               else
+                       $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&c=$comment_id") ) . "\r\n";
+               $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=spam&c=$comment_id") ) . "\r\n";
+       }
 
        $wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']));
 
@@ -1192,27 +1198,24 @@ if ( !function_exists('wp_new_user_notification') ) :
 function wp_new_user_notification($user_id, $plaintext_pass = '') {
        $user = get_userdata( $user_id );
 
-       $user_login = stripslashes($user->user_login);
-       $user_email = stripslashes($user->user_email);
-
        // The blogname option is escaped with esc_html on the way into the database in sanitize_option
        // we want to reverse this for the plain text arena of emails.
        $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 
        $message  = sprintf(__('New user registration on your site %s:'), $blogname) . "\r\n\r\n";
-       $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
-       $message .= sprintf(__('E-mail: %s'), $user_email) . "\r\n";
+       $message .= sprintf(__('Username: %s'), $user->user_login) . "\r\n\r\n";
+       $message .= sprintf(__('E-mail: %s'), $user->user_email) . "\r\n";
 
        @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message);
 
        if ( empty($plaintext_pass) )
                return;
 
-       $message  = sprintf(__('Username: %s'), $user_login) . "\r\n";
+       $message  = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
        $message .= sprintf(__('Password: %s'), $plaintext_pass) . "\r\n";
        $message .= wp_login_url() . "\r\n";
 
-       wp_mail($user_email, sprintf(__('[%s] Your username and password'), $blogname), $message);
+       wp_mail($user->user_email, sprintf(__('[%s] Your username and password'), $blogname), $message);
 
 }
 endif;
@@ -1563,7 +1566,7 @@ if ( !function_exists('wp_set_password') ) :
 function wp_set_password( $password, $user_id ) {
        global $wpdb;
 
-       $hash = wp_hash_password($password);
+       $hash = wp_hash_password( trim( $password ) );
        $wpdb->update($wpdb->users, array('user_pass' => $hash, 'user_activation_key' => ''), array('ID' => $user_id) );
 
        wp_cache_delete($user_id, 'users');
@@ -1708,16 +1711,20 @@ function wp_text_diff( $left_string, $right_string, $args = null ) {
 
        $left_lines  = explode("\n", $left_string);
        $right_lines = explode("\n", $right_string);
-
        $text_diff = new Text_Diff($left_lines, $right_lines);
-       $renderer  = new WP_Text_Diff_Renderer_Table();
+       $renderer  = new WP_Text_Diff_Renderer_Table( $args );
        $diff = $renderer->render($text_diff);
 
        if ( !$diff )
                return '';
 
        $r  = "<table class='diff'>\n";
-       $r .= "<col class='ltype' /><col class='content' /><col class='ltype' /><col class='content' />";
+
+       if ( ! empty( $args[ 'show_split_view' ] ) ) {
+               $r .= "<col class='content diffsplit left' /><col class='content diffsplit middle' /><col class='content diffsplit right' />";
+       } else {
+               $r .= "<col class='content' />";
+       }
 
        if ( $args['title'] || $args['title_left'] || $args['title_right'] )
                $r .= "<thead>";
@@ -1738,3 +1745,4 @@ function wp_text_diff( $left_string, $right_string, $args = null ) {
        return $r;
 }
 endif;
+