diff options
| -rw-r--r-- | src/wp-includes/class-wp-locale-switcher.php | 2 | ||||
| -rw-r--r-- | src/wp-includes/class-wp-phpmailer.php | 10 | ||||
| -rw-r--r-- | src/wp-includes/general-template.php | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/wp-includes/class-wp-locale-switcher.php b/src/wp-includes/class-wp-locale-switcher.php index db4ae298c6..55edef3c9c 100644 --- a/src/wp-includes/class-wp-locale-switcher.php +++ b/src/wp-includes/class-wp-locale-switcher.php @@ -287,7 +287,7 @@ class WP_Locale_Switcher { WP_Translation_Controller::get_instance()->set_locale( $locale ); if ( $phpmailer instanceof WP_PHPMailer ) { - $phpmailer->SetLanguage(); + $phpmailer->setLanguage(); } /** diff --git a/src/wp-includes/class-wp-phpmailer.php b/src/wp-includes/class-wp-phpmailer.php index b3c976d13d..c3f9f3088e 100644 --- a/src/wp-includes/class-wp-phpmailer.php +++ b/src/wp-includes/class-wp-phpmailer.php @@ -24,7 +24,7 @@ class WP_PHPMailer extends PHPMailer\PHPMailer\PHPMailer { */ public function __construct( $exceptions = false ) { parent::__construct( $exceptions ); - $this->SetLanguage(); + $this->setLanguage(); } /** @@ -32,10 +32,12 @@ class WP_PHPMailer extends PHPMailer\PHPMailer\PHPMailer { * * @since 6.8.0 * + * @param string $langcode Optional. Unused. ISO 639-1 2-character language code. Default 'en'. + * @param string $lang_path Optional. Unused. Path to the language file directory. Default empty string. * @return true Always returns true. */ - public function SetLanguage( $langcode = 'en', $lang_path = '' ) { - $error_strings = array( + public function setLanguage( $langcode = 'en', $lang_path = '' ) { + $this->language = array( 'authenticate' => __( 'SMTP Error: Could not authenticate.' ), 'buggy_php' => sprintf( /* translators: 1: mail.add_x_header. 2: php.ini */ @@ -87,7 +89,7 @@ class WP_PHPMailer extends PHPMailer\PHPMailer\PHPMailer { /* translators: There is a space after the colon. */ 'variable_set' => __( 'Cannot set or reset variable: ' ), ); - $this->language = $error_strings; + return true; } } diff --git a/src/wp-includes/general-template.php b/src/wp-includes/general-template.php index 3a965a2d3d..7bb584af7c 100644 --- a/src/wp-includes/general-template.php +++ b/src/wp-includes/general-template.php @@ -2289,7 +2289,6 @@ function get_calendar( $args = array() ) { * @type bool $display Whether to display the calendar output. Default true. * @type string $post_type Optional. Post type. Default 'post'. * } - * @return array The arguments for the `get_calendar` function. */ $args = apply_filters( 'get_calendar_args', wp_parse_args( $args, $defaults ) ); |