Ignore:
Timestamp:
Jun 7, 2011, 5:56:34 PM (9 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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2/include/functions_comment.inc.php

    r10123 r11257  
    246246    $comment_action='reject';
    247247  }
     248  elseif (!$conf['comments_validation'] or is_admin()) // should the updated comment must be validated
     249  {
     250    $comment_action='validate'; //one of validate, moderate, reject
     251  }
     252  else
     253  {
     254    $comment_action='moderate'; //one of validate, moderate, reject
     255  }
    248256
    249257  // perform more spam check
     
    263271      $user_where_clause = '   AND author_id = \''.
    264272        $GLOBALS['user']['id'].'\'';
    265     }
    266    
    267     // should the updated comment must be validated
    268     if (!$conf['comments_validation'] or is_admin())
    269     {
    270       $comment_action='validate'; //one of validate, moderate, reject
    271     }
    272     else
    273     {
    274       $comment_action='moderate'; //one of validate, moderate, reject
    275273    }
    276274
Note: See TracChangeset for help on using the changeset viewer.