From 57a749af3840115df941794c3dce4293f09151a2 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 10 Oct 2019 13:12:27 -0400
Subject: [PATCH 1/3] Add required use statement in mod/subthread

---
 mod/subthread.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mod/subthread.php b/mod/subthread.php
index 29d3f5e06e..0399ac0cef 100644
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -6,6 +6,7 @@ use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;

From 67d374a14f6d727ffafa335c77b67fee5c111b27 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 10 Oct 2019 13:12:55 -0400
Subject: [PATCH 2/3] Complete L10n::detectLanguage call parameters in
 Module\Register

---
 src/Module/Register.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Module/Register.php b/src/Module/Register.php
index 1aabb84393..10fd1aefc9 100644
--- a/src/Module/Register.php
+++ b/src/Module/Register.php
@@ -196,7 +196,7 @@ class Register extends BaseModule
 
 		$arr['blocked'] = $blocked;
 		$arr['verified'] = $verified;
-		$arr['language'] = L10nClass::detectLanguage($a->getConfig()->get('system', 'language'));
+		$arr['language'] = L10nClass::detectLanguage($_SERVER, $_GET, $a->getConfig()->get('system', 'language'));
 
 		try {
 			$result = Model\User::create($arr);

From 4b71fd24429c40bcaa2f2e6d8da50ed576f97c2b Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 10 Oct 2019 13:13:23 -0400
Subject: [PATCH 3/3] Replace deprecated calls to App->getBaseURL in
 Module\Register

---
 src/Module/Register.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Module/Register.php b/src/Module/Register.php
index 10fd1aefc9..367eeb5ade 100644
--- a/src/Module/Register.php
+++ b/src/Module/Register.php
@@ -2,6 +2,7 @@
 
 namespace Friendica\Module;
 
+use Friendica\App\BaseURL;
 use Friendica\BaseModule;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Config;
@@ -207,8 +208,10 @@ class Register extends BaseModule
 
 		$user = $result['user'];
 
+		$base_url = self::getClass(BaseURL::class)->get();
+
 		if ($netpublish && intval(Config::get('config', 'register_policy')) !== self::APPROVE) {
-			$url = $a->getBaseUrl() . '/profile/' . $user['nickname'];
+			$url = $base_url . '/profile/' . $user['nickname'];
 			Worker::add(PRIORITY_LOW, 'Directory', $url);
 		}
 
@@ -227,7 +230,7 @@ class Register extends BaseModule
 				$res = Model\User::sendRegisterOpenEmail(
 					$user,
 					Config::get('config', 'sitename'),
-					$a->getBaseUrl(),
+					$base_url,
 					$result['password']
 				);
 
@@ -239,7 +242,6 @@ class Register extends BaseModule
 						L10n::t('Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login.',
 							$user['email'],
 							$result['password'])
-						. EOL
 					);
 				}
 			} else {
@@ -283,9 +285,9 @@ class Register extends BaseModule
 					'source_name'  => $user['username'],
 					'source_mail'  => $user['email'],
 					'source_nick'  => $user['nickname'],
-					'source_link'  => $a->getBaseUrl() . '/admin/users/',
-					'link'         => $a->getBaseUrl() . '/admin/users/',
-					'source_photo' => $a->getBaseUrl() . '/photo/avatar/' . $user['uid'] . '.jpg',
+					'source_link'  => $base_url . '/admin/users/',
+					'link'         => $base_url . '/admin/users/',
+					'source_photo' => $base_url . '/photo/avatar/' . $user['uid'] . '.jpg',
 					'to_email'     => $admin['email'],
 					'uid'          => $admin['uid'],
 					'language'     => defaults($admin, 'language', 'en'),
@@ -298,7 +300,7 @@ class Register extends BaseModule
 			Model\User::sendRegisterPendingEmail(
 				$user,
 				Config::get('config', 'sitename'),
-				$a->getBaseURL(),
+				$base_url,
 				$result['password']
 			);