Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'update/marketplace-1' into fix/admin-helper-views-main-phpcs

This commit is contained in:
And Finally 2021-08-03 09:33:31 +01:00
parent a78e8354cb 92273b140a
commit e92f99d8ee
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/admin/settings/class-wc-settings-emails.php
View File

@ -51,8 +51,7 @@ class WC_Settings_Emails extends WC_Settings_Page {
'https://wordpress.org/plugins/wp-mail-logging/',
'https://docs.woocommerce.com/document/email-faq'
);
$settings = apply_filters(
'woocommerce_email_settings',
$settings =
array(
array(
'title' => __( 'Email notifications', 'woocommerce' ),
@ -217,8 +216,7 @@ class WC_Settings_Emails extends WC_Settings_Page {
'type' => 'sectionend',
'id' => 'email_merchant_notes',
),
)
);
);
return apply_filters( 'woocommerce_email_settings', $settings );
}

1
tests/php/includes/settings/class-wc-settings-emails-test.php
View File

@ -5,7 +5,6 @@
* @package WooCommerce\Tests\Settings
*/
use Automattic\WooCommerce\Testing\Tools\CodeHacking\Hacks\FunctionsMockerHack;
use Automattic\WooCommerce\Testing\Tools\CodeHacking\Hacks\StaticMockerHack;
require_once __DIR__ . '/class-wc-settings-unit-test-case.php';