Issue 6675: Improved check for follower, removed global setting

[friendica.git] / src / Module / Register.php

diff --git a/src/Module/Register.php b/src/Module/Register.php
index 202cf948e001289938175fea1eaa8c4cad946a8d..217581b160b01d52658e08cb894df09fcfa42a93 100644 (file)
--- a/src/Module/Register.php
+++ b/src/Module/Register.php
@@ -7,10 +7,10 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
+use Friendica\Core\L10n\L10n as L10nClass;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model;
@@ -144,7 +144,6 @@ class Register extends BaseModule
                        '$tostext'      => L10n::t('Terms of Service'),
                        '$showprivstatement' => Config::get('system', 'tosprivstatement'),
                        '$privstatement'=> $tos->privacy_complete,
-                       '$baseurl'      => System::baseurl(),
                        '$form_security_token' => BaseModule::getFormSecurityToken('register'),
                        '$explicit_content' => Config::get('system', 'explicit_content', false),
                        '$explicit_content_note' => L10n::t('Note: This node explicitly contains adult content')
@@ -204,7 +203,7 @@ class Register extends BaseModule
 
                $arr['blocked'] = $blocked;
                $arr['verified'] = $verified;
-               $arr['language'] = L10n::detectLanguage();
+               $arr['language'] = L10nClass::detectLanguage($a->getConfig()->get('system', 'language'));
 
                try {
                        $result = Model\User::create($arr);