Fixed bug #9769: Organisation in mail header should be Organization
authorChristian Kuhn <lolli@schwarzbu.ch>
Wed, 24 Mar 2010 22:13:57 +0000 (22:13 +0000)
committerChristian Kuhn <lolli@schwarzbu.ch>
Wed, 24 Mar 2010 22:13:57 +0000 (22:13 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7154 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/class.t3lib_formmail.php
t3lib/class.t3lib_htmlmail.php

index cd962fb..8d3dbf5 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-24  Christian Kuhn  <lolli@schwarzbu.ch>
+
+       * Fixed bug #9769: Organisation in mail header should be Organization
+
 2010-03-24  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Added feature #13909: htmlArea RTE: Extjize the default non-TYPO3 image dialogue
index c782cfe..fcff4f2 100644 (file)
@@ -84,7 +84,7 @@ class t3lib_formmail extends t3lib_htmlmail {
         * [from_name]:                 Sender name. If not set, [name] is used
         * [replyto_email]:             Reply-to email. If not set [from_email] is used
         * [replyto_name]:              Reply-to name. If not set [from_name] is used
-        * [organisation]:              Organisation (header)
+        * [organisation]:              Organization (header)
         * [priority]:                  Priority, 1-5, default 3
         * [html_enabled]:              If mail is sent as html
         * [use_base64]:                If set, base64 encoding will be used instead of quoted-printable
index 366ebaf..f1aa074 100644 (file)
@@ -502,9 +502,9 @@ class t3lib_htmlmail {
                                $this->add_header('Reply-To: '.$this->replyto_email);
                        }
                }
-                       // Organisation
+                       // Organization, using american english spelling (organization / organisation) as defined in RFC 1036 / 2076
                if ($this->organisation) {
-                       $this->add_header('Organisation: '.$this->organisation);
+                       $this->add_header('Organization: ' . $this->organisation);
                }
                        // mailer
                if ($this->mailer) {