strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1139 from fabrixxm/notifix

Browse source 
Override 'enotify_no_content' system option if type is SYSTEM_EMAIL
This commit is contained in:
fabrixxm 2014-09-10 18:33:01 +02:00
commit c05376a53e
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/enotify.php
View file

@ -542,7 +542,8 @@ function notification($params) {
call_hooks('enotify_mail', $datarray); call_hooks('enotify_mail', $datarray);
// check whether sending post content in email notifications is allowed // check whether sending post content in email notifications is allowed
$content_allowed = !get_config('system','enotify_no_content'); // always true for "SYSTEM_EMAIL"
$content_allowed = ((!get_config('system','enotify_no_content')) || ($params['type'] == "SYSTEM_EMAIL"));
// load the template for private message notifications // load the template for private message notifications
$tpl = get_markup_template('email_notify_html.tpl'); $tpl = get_markup_template('email_notify_html.tpl');