← Back to branch summary

~canonical-sysadmins/wordpress/4.7.4

« back to all changes in this revision

Viewing changes to wp-includes/pluggable.php

  • Committer: Barry Price
  • Date: 2016-09-08 02:50:41 UTC
  • mfrom: (1.1.19 upstream)
  • Revision ID: barry.price@canonical.com-20160908025041-xblhpbi3hq55m5y3
Merge WP4.6.1 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-includes/pluggable.php
349
349
         */
350
350
        $from_name = apply_filters( 'wp_mail_from_name', $from_name );
351
351
 
352
 
        $phpmailer->setFrom( $from_email, $from_name );
 
352
        $phpmailer->setFrom( $from_email, $from_name, false );
353
353
 
354
354
        // Set destination addresses
355
355
        if ( !is_array( $to ) )