Merge pull request #4577 from MrPetovan/task/add-feedtest-module

[friendica.git] / mod / register.php

diff --git a/mod/register.php b/mod/register.php
index bf87c9259fba559efd358dfae169508012c8a303..c97433c0400c8e691e07f54bb5345c11764d0a49 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -4,6 +4,7 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -14,7 +15,6 @@ use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 
 require_once 'include/enotify.php';
-require_once 'include/bbcode.php';
 
 function register_post(App $a)
 {
@@ -58,6 +58,7 @@ function register_post(App $a)
                        break;
        }
 
+       $netpublish = !empty($_POST['profile_publish_reg']);
 
        $arr = $_POST;
 
@@ -257,11 +258,11 @@ function register_content(App $a)
                '$permonly'    => $a->config['register_policy'] == REGISTER_APPROVE,
                '$permonlybox' => ['permonlybox', L10n::t('Note for the admin'), '', L10n::t('Leave a message for the admin, why you want to join this node')],
                '$invite_desc' => L10n::t('Membership on this site is by invitation only.'),
-               '$invite_label' => L10n::t('Your invitation ID: '),
+               '$invite_label' => L10n::t('Your invitation code: '),
                '$invite_id'  => $invite_id,
                '$realpeople' => $realpeople,
                '$regtitle'  => L10n::t('Registration'),
-               '$registertext' => x($a->config, 'register_text') ? bbcode($a->config['register_text']) : "",
+               '$registertext' => x($a->config, 'register_text') ? BBCode::convert($a->config['register_text']) : "",
                '$fillwith'  => $fillwith,
                '$fillext'   => $fillext,
                '$oidlabel'  => $oidlabel,