rev update

diff --git a/boot.php b/boot.php
index 93c7a3b9c10a4ff9979d8eafde851f8b6ead8311..b23549790191cdad224ea8da89d429d8085df0f1 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1471' );
+define ( 'FRIENDICA_VERSION',      '3.0.1473' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1156      );
 

diff --git a/mod/register.php b/mod/register.php
index 6bf287d4245b0c70ce12d3395b9f4ad216216d10..a8fa100c8f9c7109552405e9ea1369f187f8ee63 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -247,6 +247,8 @@ function register_content(&$a) {
 
        call_hooks('register_form',$arr);
 
+       $o = $arr['template'];
+
        $o = replace_macros($o, array(
                '$oidhtml' => $oidhtml,
                '$invitations' => get_config('system','invitation_only'),

diff --git a/util/messages.po b/util/messages.po
index 30703dfe85854301140cb336636bb94be5089da5..cfe795cf0b792afb078bb9572bacf877e0595e16 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1471\n"
+"Project-Id-Version: 3.0.1473\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-19 10:00-0700\n"
+"POT-Creation-Date: 2012-09-21 10:00-0700\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"
@@ -3048,38 +3048,38 @@ msgstr ""
 msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/register.php:253
+#: ../../mod/register.php:255
 msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../mod/register.php:254
+#: ../../mod/register.php:256
 msgid "Your invitation ID: "
 msgstr ""
 
-#: ../../mod/register.php:257 ../../mod/admin.php:444
+#: ../../mod/register.php:259 ../../mod/admin.php:444
 msgid "Registration"
 msgstr ""
 
-#: ../../mod/register.php:265
+#: ../../mod/register.php:267
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
-#: ../../mod/register.php:266
+#: ../../mod/register.php:268
 msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/register.php:267
+#: ../../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:268
+#: ../../mod/register.php:270
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:271 ../../include/nav.php:81 ../../boot.php:887
+#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:887
 msgid "Register"
 msgstr ""
 
@@ -7852,7 +7852,7 @@ msgstr ""
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: ../../include/diaspora.php:2202
+#: ../../include/diaspora.php:2211
 msgid "Attachments:"
 msgstr ""
 

diff --git a/view/en/friend_complete_eml.tpl b/view/en/friend_complete_eml.tpl
index 89f578388197295d3fcfbdcca6debb30c31e9cba..ab12fcb6b707db533d5baa089e0d6c364c8ec0b0 100644 (file)
--- a/view/en/friend_complete_eml.tpl
+++ b/view/en/friend_complete_eml.tpl
@@ -1,22 +1,22 @@
 
-Dear $[username],
+Dear $username,
 
-       Great news... '$[fn]' at '$[dfrn_url]' has accepted 
-your connection request at '$[sitename]'.
+       Great news... '$fn' at '$dfrn_url' has accepted 
+your connection request at '$sitename'.
 
 You are now mutual friends and may exchange status updates, photos, and email
 without restriction.
 
-Please visit your 'Contacts' page at $[sitename] if you wish to make 
+Please visit your 'Contacts' page at $sitename if you wish to make 
 any changes to this relationship. 
 
-$[siteurl]
+$siteurl
 
 [For instance, you may create a separate profile with information that is not
-available to the general public - and assign viewing rights to '$[fn]'].
+available to the general public - and assign viewing rights to '$fn'].
 
 Sincerely,
 
-       $[sitename] Administrator
+       $sitename Administrator
 
  

diff --git a/view/en/intro_complete_eml.tpl b/view/en/intro_complete_eml.tpl
index cd78b2a150dbb7ca201004915b38ca84e8e6d6d3..a60745ec5549783104cf7141f2f0b00b0f5debfc 100644 (file)
--- a/view/en/intro_complete_eml.tpl
+++ b/view/en/intro_complete_eml.tpl
@@ -1,22 +1,22 @@
 
-Dear $[username],
+Dear $username,
 
-       '$[fn]' at '$[dfrn_url]' has accepted 
-your connection request at '$[sitename]'.
+       '$fn' at '$dfrn_url' has accepted 
+your connection request at '$sitename'.
 
-       '$[fn]' has chosen to accept you a "fan", which restricts 
+       '$fn' has chosen to accept you a "fan", which restricts 
 some forms of communication - such as private messaging and some profile
 interactions. If this is a celebrity or community page, these settings were
 applied automatically.
 
-       '$[fn]' may choose to extend this into a two-way or more permissive 
+       '$fn' may choose to extend this into a two-way or more permissive 
 relationship in the future. 
 
-       You will start receiving public status updates from '$[fn]', 
+       You will start receiving public status updates from '$fn', 
 which will appear on your 'Network' page at  
 
-$[siteurl]
+$siteurl
 
 Sincerely,
 
-       $[sitename] Administrator
+       $sitename Administrator