Merged in release/release-1.09 (pull request #10)
Release/release 1.09 * Install missing plugins * rs set to 1 * rebase pantheon for aws * rebase pantheon for aws * prod config change * prod config change * fix campaing issue * revert Approved-by: Jay Sharma
This commit is contained in:
committed by
Jay Sharma
parent
779393381f
commit
22f10a9edd
@@ -46,7 +46,6 @@ class Options {
|
||||
'pass',
|
||||
],
|
||||
'gmail' => [
|
||||
'one_click_setup_enabled',
|
||||
'client_id',
|
||||
'client_secret',
|
||||
],
|
||||
@@ -233,7 +232,7 @@ class Options {
|
||||
*/
|
||||
public static function get_defaults() {
|
||||
|
||||
$defaults = [
|
||||
return [
|
||||
'mail' => [
|
||||
'from_email' => get_option( 'admin_email' ),
|
||||
'from_name' => get_bloginfo( 'name' ),
|
||||
@@ -250,15 +249,6 @@ class Options {
|
||||
SummaryReportEmail::SETTINGS_SLUG => ! is_multisite() ? false : true,
|
||||
],
|
||||
];
|
||||
|
||||
/**
|
||||
* Filters the default options.
|
||||
*
|
||||
* @since 3.11.0
|
||||
*
|
||||
* @param array $defaults Default options.
|
||||
*/
|
||||
return apply_filters( 'wp_mail_smtp_options_get_defaults', $defaults );
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user