Skip to content
This repository has been archived by the owner on Mar 30, 2024. It is now read-only.

Commit

Permalink
Fix Deadlock in v1.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
kimbtech committed Jan 3, 2020
1 parent 8ff13c2 commit 31d6042
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
latest
1.1.5
1.1.6
1.1
1
3 changes: 2 additions & 1 deletion core/Mail.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
class Mail {

private static $templates = array(
'mailAdminNotif'
'mailAdminNotif',
'mailNewPollNotif'
);

private $type, $template, $mailHeader;
Expand Down
2 changes: 1 addition & 1 deletion core/PollCreator.php
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ private function sendNewPollMail() {
$m->setContent('POLLNAME', Utilities::optimizeOutputString( $this->data['pollname'] ));
$m->setContent('POLLDESCRIP', Utilities::optimizeOutputString( $this->data['description'] ));
$m->setContent('ADMINLINK', $this->getAdminLink() );
$m->setContent('POLLLINK', URL::generateLink('poll', '', $this->data['code']['poll'] ));
$m->setContent('POLLLINK', URL::generateLink('poll', $this->data['code']['poll'], '' ));
$m->setContent('POLLID', $this->data['code']['poll'] );

$m->sendMail( $to );
Expand Down
2 changes: 1 addition & 1 deletion core/Utilities.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Utilities{
/**
* The system's Version
*/
const SYS_VERSION = 'v1.1.5';
const SYS_VERSION = 'v1.1.6';

/**
* Possible chars for:
Expand Down
2 changes: 1 addition & 1 deletion data/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
},
"urlrewrite": false,
"cookiebanner": false,
"newpollmailto" : "[email protected]"
"newpollmailto": "[email protected]"
}
2 changes: 1 addition & 1 deletion docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:
- CONF_site_pagename=KIMB-Forms-Project Dev
- CONF_site_footercontent=Development Version
- CONF_captcha_poll=false
- CONF_captcha_new=true
- CONF_captcha_new=false
- CONF_texts_enablePoll=true
- CONF_texts_enableNew=true
- CONF_texts_textPoll=Ich bin mit den Datenschutzrichlinien ... einverstanden!
Expand Down

0 comments on commit 31d6042

Please sign in to comment.