friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #7723 from MrPetovan/bug/fatal-errors 

Complete L10n::detectLanguage call parameters in Module\Register
This commit is contained in:
Philipp 2019-10-10 23:25:00 +02:00 committed by GitHub
parent 50fa119f79 4b71fd2442
commit f300c8040f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mod/subthread.php
View File

@ -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;

18
src/Module/Register.php
View File

@ -2,6 +2,7 @@
namespace Friendica\Module;
use Friendica\App\BaseURL;
use Friendica\BaseModule;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Config;
@ -196,7 +197,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);
@ -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']
);