notify: Do not pass notification texts via pipes

Directly retrieve comments from the database instead of additionally
passing them via stdin.

Fixes FS#46742.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
This commit is contained in:
Lukas Fleischer 2015-12-12 18:28:42 +01:00
parent 5931d5ceec
commit e45609cf66
4 changed files with 30 additions and 12 deletions

View file

@ -158,7 +158,7 @@ function pkgreq_file($ids, $type, $merge_into, $comments) {
if ($type === 'merge') {
$params[] = $merge_into;
}
notify($params, $comments);
notify($params);
$auto_orphan_age = config_get('options', 'auto_orphan_age');
$auto_delete_age = config_get('options', 'auto_delete_age');
@ -233,7 +233,7 @@ function pkgreq_close($id, $reason, $comments, $auto_close=false) {
$dbh->exec($q);
/* Send e-mail notifications. */
notify(array('request-close', $uid, $id, $reason), $comments);
notify(array('request-close', $uid, $id, $reason));
return array(true, __("Request closed successfully."));
}