Jiggled the config file a little bit
This commit is contained in:
@@ -18,8 +18,6 @@ return [
|
|||||||
'organisation' => [
|
'organisation' => [
|
||||||
'registration' => [
|
'registration' => [
|
||||||
'require_approval' => true,
|
'require_approval' => true,
|
||||||
],
|
|
||||||
'approval' => [
|
|
||||||
'timeout' => -1,
|
'timeout' => -1,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -135,7 +135,7 @@ class OrganisationRegistrationController extends SimpleController
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
if ($config['organisation.registration.require_approval']) {
|
if ($config['organisation.registration.require_approval']) {
|
||||||
$timeout = $this->ci->config['organisation.approval.timeout'];
|
$timeout = $this->ci->config['organisation.registration.timeout'];
|
||||||
|
|
||||||
// Try to generate a new approval request
|
// Try to generate a new approval request
|
||||||
$approval = $this->ci->repoOrganisationApproval->create($organisation, $currentUser, $timeout);
|
$approval = $this->ci->repoOrganisationApproval->create($organisation, $currentUser, $timeout);
|
||||||
@@ -644,7 +644,7 @@ class OrganisationRegistrationController extends SimpleController
|
|||||||
*/
|
*/
|
||||||
protected function sendApprovalEmail(UserInterface $requester, OrganisationInterface $organisation, $token)
|
protected function sendApprovalEmail(UserInterface $requester, OrganisationInterface $organisation, $token)
|
||||||
{
|
{
|
||||||
$timeout = $this->ci->config['organisation.approval.timeout'];
|
$timeout = $this->ci->config['organisation.registration.timeout'];
|
||||||
|
|
||||||
// Create and send approval email
|
// Create and send approval email
|
||||||
$message = new TwigMailMessage($this->ci->view, 'mail/organisation-approval-request.html.twig');
|
$message = new TwigMailMessage($this->ci->view, 'mail/organisation-approval-request.html.twig');
|
||||||
|
|||||||
Reference in New Issue
Block a user