Override 'enotify_no_content' system option if type is SYSTEM_EMAIL

diff --git a/include/enotify.php b/include/enotify.php
index 04db10500a1a337616a195de88e0a7457fff84ae..51263871b6aad1d4d5d8716ed65a3c1d34f0d304 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -542,7 +542,8 @@ function notification($params) {
                call_hooks('enotify_mail', $datarray);
 
                // 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
                $tpl = get_markup_template('email_notify_html.tpl');