fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)
fu ([personal profile] fu) wrote in [site community profile] changelog2010-11-24 06:53 am

[dw-free] Stop maintainers from 'jumping' the moderation queue of a comm

[commit: http://hg.dwscoalition.org/dw-free/rev/e8bea52b49f9]

http://bugs.dwscoalition.org/show_bug.cgi?id=3269

Make moderation apply to admins and moderators as well. Old behavior (not
skipping the mod queue) can be restored by checking the "unmoderated"
checkbox for admins.

Patch by [personal profile] ninetydegrees.

Files modified:
  • cgi-bin/ljprotocol.pl
--------------------------------------------------------------------------------
diff -r eb82141b1a9c -r e8bea52b49f9 cgi-bin/ljprotocol.pl
--- a/cgi-bin/ljprotocol.pl	Wed Nov 24 11:36:30 2010 +0800
+++ b/cgi-bin/ljprotocol.pl	Wed Nov 24 14:53:42 2010 +0800
@@ -1384,11 +1384,11 @@ sub postevent
 
     # if posting to a moderated community, store and bail out here
     if ($uowner->is_community && $uowner->{'moderated'} && !$flags->{'nomod'}) {
-        # don't moderate admins, moderators & pre-approved users
+        # Don't moderate pre-approved users
         my $dbh = LJ::get_db_writer();
         my $relcount = $dbh->selectrow_array("SELECT COUNT(*) FROM reluser ".
                                              "WHERE userid=$ownerid AND targetid=$posterid ".
-                                             "AND type IN ('A','M','N')");
+                                             "AND type IN ('N')");
         unless ($relcount) {
             # moderation queue full?
             my $modcount = $dbcm->selectrow_array("SELECT COUNT(*) FROM modlog WHERE journalid=$ownerid");
--------------------------------------------------------------------------------