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

Replace deprecated calls to App->getBaseURL in Module\Register

Browse source
This commit is contained in:
Hypolite Petovan 2019-10-10 13:13:23 -04:00
parent 67d374a14f
commit 4b71fd2442
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Module/Register.php
View file

@ -2,6 +2,7 @@
namespace Friendica\Module; namespace Friendica\Module;
use Friendica\App\BaseURL;
use Friendica\BaseModule; use Friendica\BaseModule;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Core\Config; use Friendica\Core\Config;
@ -207,8 +208,10 @@ class Register extends BaseModule
$user = $result['user']; $user = $result['user'];
$base_url = self::getClass(BaseURL::class)->get();
if ($netpublish && intval(Config::get('config', 'register_policy')) !== self::APPROVE) { 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); Worker::add(PRIORITY_LOW, 'Directory', $url);
} }
@ -227,7 +230,7 @@ class Register extends BaseModule
$res = Model\User::sendRegisterOpenEmail( $res = Model\User::sendRegisterOpenEmail(
$user, $user,
Config::get('config', 'sitename'), Config::get('config', 'sitename'),
$a->getBaseUrl(), $base_url,
$result['password'] $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.', 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'], $user['email'],
$result['password']) $result['password'])
. EOL
); );
} }
} else { } else {
@ -283,9 +285,9 @@ class Register extends BaseModule
'source_name' => $user['username'], 'source_name' => $user['username'],
'source_mail' => $user['email'], 'source_mail' => $user['email'],
'source_nick' => $user['nickname'], 'source_nick' => $user['nickname'],
'source_link' => $a->getBaseUrl() . '/admin/users/', 'source_link' => $base_url . '/admin/users/',
'link' => $a->getBaseUrl() . '/admin/users/', 'link' => $base_url . '/admin/users/',
'source_photo' => $a->getBaseUrl() . '/photo/avatar/' . $user['uid'] . '.jpg', 'source_photo' => $base_url . '/photo/avatar/' . $user['uid'] . '.jpg',
'to_email' => $admin['email'], 'to_email' => $admin['email'],
'uid' => $admin['uid'], 'uid' => $admin['uid'],
'language' => defaults($admin, 'language', 'en'), 'language' => defaults($admin, 'language', 'en'),
@ -298,7 +300,7 @@ class Register extends BaseModule
Model\User::sendRegisterPendingEmail( Model\User::sendRegisterPendingEmail(
$user, $user,
Config::get('config', 'sitename'), Config::get('config', 'sitename'),
$a->getBaseURL(), $base_url,
$result['password'] $result['password']
); );