diff options
Diffstat (limited to 'include/enotify.php')
-rw-r--r-- | include/enotify.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/enotify.php b/include/enotify.php index b0f6b4823..2503f9ab0 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -461,6 +461,8 @@ function notification($params) { // Might be interesting to use GPG,PGP,S/MIME encryption instead // but we'll save that for a clever plugin developer to implement + $private_activity = false; + if(! $datarray['email_secure']) { switch($params['type']) { case NOTIFY_WALL: @@ -469,6 +471,7 @@ function notification($params) { case NOTIFY_COMMENT: if(! $private) break; + $private_activity = true; case NOTIFY_MAIL: $datarray['textversion'] = $datarray['htmlversion'] = $datarray['title'] = ''; $datarray['subject'] = preg_replace('/' . preg_quote(t('[Red:Notify]')) . '/','$0*',$datarray['subject']); @@ -478,6 +481,12 @@ function notification($params) { } } + if($private_activity + && intval(get_pconfig($datarray['uid'],'system','ignore_private_notifications'))) { + pop_lang(); + return; + } + // load the template for private message notifications $tpl = get_markup_template('email_notify_html.tpl'); $email_html_body = replace_macros($tpl,array( |