diff --git a/boot.php b/boot.php index 9fd9b2c64..5d71a4d44 100644 --- 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 ba947a9bf..9c405c101 100644 --- 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 4fe9eaf90..4d24bff28 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -1,6 +1,7 @@ \n" "Language-Team: LANGUAGE \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 'nickname@$sitename'." 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 ""