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
Piwigo · Nov 15, 2010 · 94af103 · 94af103
1 parent 4ae463a
commit 94af103
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/include/functions_comment.inc.php b/include/functions_comment.inc.php
@@ -124,7 +124,7 @@ function insert_user_comment( &$comm, $key, &$infos )
     $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']);