holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Tracker: fix empty notification mail, if ticket was opened by following a link in notification mail

Browse Source
This commit is contained in:
Ralf Becker 2020-11-21 18:55:39 +01:00
parent 1cda58c9be
commit d759e4b5a9
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/Etemplate.php
View File

@ -486,7 +486,11 @@ class Etemplate extends Etemplate\Widget\Template
//error_log(__METHOD__."(,".array2string($content).')');
//error_log(' validated='.array2string($validated));
return ExecMethod(self::$request->method, self::complete_array_merge(self::$request->preserv, $validated));
ExecMethod(self::$request->method, self::complete_array_merge(self::$request->preserv, $validated));
// run egw destructor now explicit, in case a (notification) email is send via Egw::on_shutdown(),
// as stream-wrappers used by Horde Smtp fail when PHP is already in destruction
$GLOBALS['egw']->__destruct();
}
public $name;

3
json.php
View File

@ -129,6 +129,9 @@ try {
$json->parseRequest($_GET['menuaction'], $_REQUEST['json_data']);
}
Json\Response::get();
// run egw destructor now explicit, in case a (notification) email is send via Egw::on_shutdown(),
// as stream-wrappers used by Horde Smtp fail when PHP is already in destruction
$GLOBALS['egw']->__destruct();
}
// missing menuaction GET parameter or request:parameters object or unparsable JSON