Merge pull request #1139 from fabrixxm/notifix

Override 'enotify_no_content' system option if type is SYSTEM_EMAIL

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');