Changeset 11257 for branches/2.2/include/functions_comment.inc.php

Timestamp:

Jun 7, 2011, 5:56:34 PM (13 years ago)

Author:

Eric

Message:

r11253 merged from trunk - Tests are OK
bug 2323 fixed : Refactoring update_user_comment() function to use user_comment_check trigger in a better place.

File:

• branches/2.2/include/functions_comment.inc.php (modified) (2 diffs)

branches/2.2/include/functions_comment.inc.php

@@ -246 +246 @@
     $comment_action='reject';
   }
+  elseif (!$conf['comments_validation'] or is_admin()) // should the updated comment must be validated
+  {
+    $comment_action='validate'; //one of validate, moderate, reject
+  }
+  else
+  {
+    $comment_action='moderate'; //one of validate, moderate, reject
+  }
 
   // perform more spam check
@@ -263 +271 @@
       $user_where_clause = '   AND author_id = \''.
         $GLOBALS['user']['id'].'\'';
-    }
-    
-    // should the updated comment must be validated
-    if (!$conf['comments_validation'] or is_admin())
-    {
-      $comment_action='validate'; //one of validate, moderate, reject
-    }
-    else
-    {
-      $comment_action='moderate'; //one of validate, moderate, reject
     }