Skip to content
Snippets Groups Projects
Commit 50ec6a6c authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch '738-dev' into 'develop'

Backport from !738

See merge request ispconfig/ispconfig3!1161
parents 5820c289 a81ab9b2
No related branches found
No related tags found
No related merge requests found
...@@ -76,7 +76,7 @@ class getmail_plugin { ...@@ -76,7 +76,7 @@ class getmail_plugin {
function update($event_name, $data) { function update($event_name, $data) {
global $app, $conf; global $app, $conf;
// Do not write getmail config files on mirror servers to avoid double fetching of emails. // Do not write getmail config files on mirror servers to avoid double fetching of emails.
if($conf['mirror_server_id'] > 0) return true; if($conf['mirror_server_id'] > 0) return true;
...@@ -116,7 +116,7 @@ class getmail_plugin { ...@@ -116,7 +116,7 @@ class getmail_plugin {
$tpl = str_replace('{DELETE}', 'false', $tpl); $tpl = str_replace('{DELETE}', 'false', $tpl);
} }
if($data["new"]["read_all"] == 'y') { if($data["new"]["source_read_all"] == 'y') {
$tpl = str_replace('{READ_ALL}', 'true', $tpl); $tpl = str_replace('{READ_ALL}', 'true', $tpl);
} else { } else {
$tpl = str_replace('{READ_ALL}', 'false', $tpl); $tpl = str_replace('{READ_ALL}', 'false', $tpl);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment