aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-11-15 09:58:19 +0000
committerplegall <plg@piwigo.org>2010-11-15 09:58:19 +0000
commit94af10300056dc0f0800ebca75fce6ccd22be1e0 (patch)
tree3860c9e5b4b6d2e0712371997285d918c0cb47eb
parent4ae463a2fb56de6476df7c70b852ba7425fa843f (diff)
merge r7783 from branch 2.1 to trunk
bug 2036 fixed: anti flood limitations for user comments should not apply to administrators. git-svn-id: http://piwigo.org/svn/trunk@7784 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/functions_comment.inc.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/functions_comment.inc.php b/include/functions_comment.inc.php
index d5b403b8e..55db09e04 100644
--- a/include/functions_comment.inc.php
+++ b/include/functions_comment.inc.php
@@ -124,7 +124,7 @@ SELECT COUNT(*) AS user_exists
$comment_action='reject';
}
- if ($comment_action!='reject' and $conf['anti-flood_time']>0 )
+ if ($comment_action!='reject' and $conf['anti-flood_time']>0 and !is_admin())
{ // anti-flood system
$reference_date = pwg_db_get_flood_period_expression($conf['anti-flood_time']);