Changeset 1081 in ExiteCMS for trunk/includes/sendmail_include.php

Timestamp:

11/07/07 16:57:20 (5 years ago)

Author:

root

Message:

removed empty locale index files
moved some locale settings (charset, country, dateinfo) from $locale to $settings
updated the modules and templates that used these variables

File:

• trunk/includes/sendmail_include.php (modified) (2 diffs)

trunk/includes/sendmail_include.php

@@ -19 +19 @@
     
     $mail = new PHPMailer();
-    if (file_exists(PATH_INCLUDES."languages/phpmailer.lang-".$locale['phpmailer'].".php")) {
-        $mail->SetLanguage($locale['phpmailer'], PATH_INCLUDES."language/");
+    if (file_exists(PATH_INCLUDES."languages/phpmailer.lang-".$settings['locale_code'].".php")) {
+        $mail->SetLanguage($settings['locale_code'], PATH_INCLUDES."language/");
     } else {
         $mail->SetLanguage("en", PATH_INCLUDES."language/");
@@ -36 +36 @@
     }
     
-    $mail->CharSet = $locale['charset'];
+    $mail->CharSet = $settings['charset'];
     $mail->From = $fromemail;
     $mail->FromName = $fromname;