If we're going to encode the email headers, we probably should use the encoded versio...

diff --git a/boot.php b/boot.php
index 9fd9b2c6484f36b0c98f0fdd503192f348534c29..5d71a4d4433285bfffaee85b620a062ad0f5e5ca 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1575' );
+define ( 'FRIENDICA_VERSION',      '3.1.1576' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1157      );
 

diff --git a/include/enotify.php b/include/enotify.php
index ba947a9bf99e334a456c230f65b66ab912ae06ae..9c405c101b91623096045102fd2a332605cacbf0 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -471,8 +471,8 @@ class enotify {
                // generate a multipart/alternative message header
                $messageHeader =
                        $params['additionalMailHeader'] .
-                       "From: {$params['fromName']} <{$params['fromEmail']}>\n" . 
-                       "Reply-To: {$params['fromName']} <{$params['replyTo']}>\n" .
+                       "From: $fromName <{$params['fromEmail']}>\n" . 
+                       "Reply-To: $fromName <{$params['replyTo']}>\n" .
                        "MIME-Version: 1.0\n" .
                        "Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\"";
 
@@ -493,7 +493,7 @@ class enotify {
                // send the message
                $res = mail(
                        $params['toEmail'],                                                                             // send to address
-                       $params['messageSubject'],                                                              // subject
+                       $messageSubject,                                                                // subject
                        $multipartMessageBody,                                                  // message body
                        $messageHeader                                                                  // message headers
                );

diff --git a/include/socgraph.php b/include/socgraph.php
index 4fe9eaf9095cd029e20a11103f521e027757451e..4d24bff286cbe668813b5d7f73f96e1e7a4c9664 100644 (file)
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once('include/datetime.php');
+require_once('include/zot.php');
 
 
 /*

diff --git a/util/messages.po b/util/messages.po
index 9fc1745f50582a1bfe8639a8f26dbf52639ffd33..732f0e85fd59250a90bbf75c8ad965070ba77478 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1575\n"
+"Project-Id-Version: 3.1.1576\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-01 10:00-0800\n"
+"POT-Creation-Date: 2013-01-02 10:00-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3240,38 +3240,38 @@ msgstr ""
 msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/register.php:256
+#: ../../mod/register.php:255
 msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../mod/register.php:257
+#: ../../mod/register.php:256
 msgid "Your invitation ID: "
 msgstr ""
 
-#: ../../mod/register.php:260 ../../mod/admin.php:462
+#: ../../mod/register.php:259 ../../mod/admin.php:462
 msgid "Registration"
 msgstr ""
 
-#: ../../mod/register.php:268
+#: ../../mod/register.php:267
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
-#: ../../mod/register.php:269
+#: ../../mod/register.php:268
 msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/register.php:270
+#: ../../mod/register.php:269
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be '<strong>nickname@$sitename</"
 "strong>'."
 msgstr ""
 
-#: ../../mod/register.php:271
+#: ../../mod/register.php:270
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:951
+#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:951
 msgid "Register"
 msgstr ""