aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2007-11-20 22:34:13 +0000
committerrub <rub@piwigo.org>2007-11-20 22:34:13 +0000
commitd453f9a7d4d6d8e6e6a09b5adb61319efafe91fb (patch)
tree26f623c2df21c9290994c60bf3ebef24f849fee1
parentfabfd5eb6eb3279acfb167fd65489f4499d1e0cd (diff)
Send comment notification only if comment is not validated and $conf is true.
Merge BSF 2165:2166 into branch-1_7 git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2167 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/functions_comment.inc.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/functions_comment.inc.php b/include/functions_comment.inc.php
index 1a894b69d..c6f6b75aa 100644
--- a/include/functions_comment.inc.php
+++ b/include/functions_comment.inc.php
@@ -189,8 +189,12 @@ INSERT INTO '.COMMENTS_TABLE.'
$comm['id'] = mysql_insert_id();
- if ( ($comment_action=='validate' and $conf['email_admin_on_comment'])
- or $conf['email_admin_on_comment_validation'] )
+ if
+ (
+ ($comment_action=='validate' and $conf['email_admin_on_comment'])
+ or
+ ($comment_action!='validate' and $conf['email_admin_on_comment_validation'])
+ )
{
include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');