bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge branch 'master' of http://github.com/friendica/friendica

Browse source
This commit is contained in:
pixelroot 2012-09-22 08:36:50 +02:00
commit 994c37b85b
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -11,7 +11,7 @@ require_once('include/cache.php');
require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('library/Mobile_Detect/Mobile_Detect.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1471' ); define ( 'FRIENDICA_VERSION', '3.0.1473' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1156 ); define ( 'DB_UPDATE_VERSION', 1156 );

2
mod/register.php
View file

@ -247,6 +247,8 @@ function register_content(&$a) {
call_hooks('register_form',$arr); call_hooks('register_form',$arr);
$o = $arr['template'];
$o = replace_macros($o, array( $o = replace_macros($o, array(
'$oidhtml' => $oidhtml, '$oidhtml' => $oidhtml,
'$invitations' => get_config('system','invitation_only'), '$invitations' => get_config('system','invitation_only'),

22
util/messages.po
View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 3.0.1471\n" "Project-Id-Version: 3.0.1473\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -3048,38 +3048,38 @@ msgstr ""
msgid "Include your profile in member directory?" msgid "Include your profile in member directory?"
msgstr "" msgstr ""
#: ../../mod/register.php:253 #: ../../mod/register.php:255
msgid "Membership on this site is by invitation only." msgid "Membership on this site is by invitation only."
msgstr "" msgstr ""
#: ../../mod/register.php:254 #: ../../mod/register.php:256
msgid "Your invitation ID: " msgid "Your invitation ID: "
msgstr "" msgstr ""
#: ../../mod/register.php:257 ../../mod/admin.php:444 #: ../../mod/register.php:259 ../../mod/admin.php:444
msgid "Registration" msgid "Registration"
msgstr "" msgstr ""
#: ../../mod/register.php:265 #: ../../mod/register.php:267
msgid "Your Full Name (e.g. Joe Smith): " msgid "Your Full Name (e.g. Joe Smith): "
msgstr "" msgstr ""
#: ../../mod/register.php:266 #: ../../mod/register.php:268
msgid "Your Email Address: " msgid "Your Email Address: "
msgstr "" msgstr ""
#: ../../mod/register.php:267 #: ../../mod/register.php:269
msgid "" msgid ""
"Choose a profile nickname. This must begin with a text character. Your " "Choose a profile nickname. This must begin with a text character. Your "
"profile address on this site will then be '<strong>nickname@$sitename</" "profile address on this site will then be '<strong>nickname@$sitename</"
"strong>'." "strong>'."
msgstr "" msgstr ""
#: ../../mod/register.php:268 #: ../../mod/register.php:270
msgid "Choose a nickname: " msgid "Choose a nickname: "
msgstr "" 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" msgid "Register"
msgstr "" msgstr ""
@ -7852,7 +7852,7 @@ msgstr ""
msgid "Sharing notification from Diaspora network" msgid "Sharing notification from Diaspora network"
msgstr "" msgstr ""
#: ../../include/diaspora.php:2202 #: ../../include/diaspora.php:2211
msgid "Attachments:" msgid "Attachments:"
msgstr "" msgstr ""