Merge branch 'develop' into gli-2152

2025-03-28 15:29:49 +05:30
parent 8901e71d30 9518a916fa
commit 9bd4ae72d0
34 changed files with 389 additions and 272 deletions
--- a/controllers/admin/AdminEmailsController.php
+++ b/controllers/admin/AdminEmailsController.php
@@ -204,7 +204,7 @@ class AdminEmailsControllerCore extends AdminController

        if (!defined('_PS_HOST_MODE_')) {
            $this->fields_options['email']['fields']['PS_MAIL_METHOD']['choices'][1] =
-                $this->l('Use PHP\'s mail() function (recommended; works in most cases)');
+                $this->l('Use PHP\'s mail() function');
        }

        ksort($this->fields_options['email']['fields']['PS_MAIL_METHOD']['choices']);