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
This commit is contained in:
plegall 2010-11-15 09:58:19 +00:00
parent 4ae463a2fb
commit 94af103000

View file

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