Merge branch '4.3-dev' into 4.4-dev

Author: laoneo

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

@@ -1204,7 +1204,9 @@ public function sendTestMail()
         $mailer = new MailTemplate('com_config.test_mail', $user->getParam('language', $app->get('language')), $mail);
         $mailer->addTemplateData(
             [
-                'sitename' => $app->get('sitename'),
+                // 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),
                 'method'   => Text::_('COM_CONFIG_SENDMAIL_METHOD_' . strtoupper($mail->Mailer)),
             ]
         );

administrator/components/com_finder/src/Indexer/Language.php

@@ -132,7 +132,7 @@ public function tokenise($input)
          *
          * Regexes:
          *  1. Remove everything except letters, numbers, quotes, apostrophe, plus, dash, period, and comma.
-         *  2. Remove plus, dash, period, and comma characters located before letter characters.
+         *  2. Remove plus, dash, and comma characters located before letter characters.
          *  3. Remove plus, dash, period, and comma characters located after other characters.
          *  4. Remove plus, period, and comma characters enclosed in alphabetical characters. Ungreedy.
          *  5. Remove orphaned apostrophe, plus, dash, period, and comma characters.
@@ -142,7 +142,7 @@ public function tokenise($input)
          */
         $input = StringHelper::strtolower($input);
         $input = preg_replace('#[^\pL\pM\pN\p{Pi}\p{Pf}\'+-.,]+#mui', ' ', $input);
-        $input = preg_replace('#(^|\s)[+-.,]+([\pL\pM]+)#mui', ' $1', $input);
+        $input = preg_replace('#(^|\s)[+-,]+([\pL\pM]+)#mui', ' $1', $input);
         $input = preg_replace('#([\pL\pM\pN]+)[+-.,]+(\s|$)#mui', '$1 ', $input);
         $input = preg_replace('#([\pL\pM]+)[+.,]+([\pL\pM]+)#muiU', '$1 $2', $input);
         $input = preg_replace('#(^|\s)[\'+-.,]+(\s|$)#mui', ' ', $input);