| @@ -23,32 +23,23 @@ | ||
| 23 | 23 | protected function __construct() { |
| 24 | 24 | |
| 25 | 25 | $this->shortcode_intances = [ |
| 26 | 26 | CommonShortcodes::get_instance(), |
| 27 | - | |
| 27 | + OrderDetailsShortcodes::get_instance(), | |
| 28 | + HookShortcodes::get_instance(), | |
| 29 | + ShippingShortcodes::get_instance(), | |
| 30 | + BillingShortcodes::get_instance(), | |
| 31 | + PaymentsShortcodes::get_instance(), | |
| 32 | + NewUsersShortcodes::get_instance(), | |
| 33 | + ResetPasswordsShortcodes::get_instance(), | |
| 34 | + OrderMetaShortcodes::get_instance(), | |
| 28 | 35 | LegacyCustomShortcodes::get_instance(), |
| 29 | 36 | |
| 37 | + /** | |
| 38 | + * @since 4.0.6 | |
| 39 | + */ | |
| 40 | + RefundShortcodes::get_instance(), | |
| 30 | 41 | ]; |
| 31 | - | |
| 32 | - if ( function_exists( 'WC' ) && defined( 'YAYMAIL_VERSION' ) ) { | |
| 33 | - $this->shortcode_intances = array_merge( | |
| 34 | - $this->shortcode_intances, | |
| 35 | - [ | |
| 36 | - OrderDetailsShortcodes::get_instance(), | |
| 37 | - HookShortcodes::get_instance(), | |
| 38 | - ShippingShortcodes::get_instance(), | |
| 39 | - BillingShortcodes::get_instance(), | |
| 40 | - PaymentsShortcodes::get_instance(), | |
| 41 | - NewUsersShortcodes::get_instance(), | |
| 42 | - ResetPasswordsShortcodes::get_instance(), | |
| 43 | - OrderMetaShortcodes::get_instance(), | |
| 44 | - /** | |
| 45 | - * @since 4.0.6 | |
| 46 | - */ | |
| 47 | - RefundShortcodes::get_instance(), | |
| 48 | - ] | |
| 49 | - ); | |
| 50 | - } | |
| 51 | 42 | |
| 52 | 43 | do_action( 'yaymail_register_shortcodes', $this ); |
| 53 | 44 | |
| 54 | 45 | foreach ( yaymail_get_emails() as $email ) { |
