Merge branch '4.3-dev' into 4.4-dev

Author: laoneo

administrator/components/com_config/src/Model/ApplicationModel.php

@@ -1204,9 +1204,8 @@ public function sendTestMail()
         $mailer = new MailTemplate('com_config.test_mail', $user->getParam('language', $app->get('language')), $mail);
         $mailer->addTemplateData(
             [
-                // Replace the occurrences of "@" and "|" in the site name in order to send the test mail, as these
-                // characters produce an error else wise: https://github.com/joomla/joomla-cms/issues/41061
-                'sitename' => preg_filter(['/@/', '/\|/'], '', $app->get('sitename'), -1),
+                // Replace the occurrences of "@" and "|" in the site name
+                'sitename' => str_replace(['@', '|'], '', $app->get('sitename')),
                 'method'   => Text::_('COM_CONFIG_SENDMAIL_METHOD_' . strtoupper($mail->Mailer)),
             ]
         );