[livejournal] r18081: LJSUP-7738

U   trunk/cgi-bin/LJ/Setting/CommentScreening.pm
U   trunk/cgi-bin/LJ/Talk.pm
U   trunk/htdocs/update.bml

Modified: trunk/cgi-bin/LJ/Setting/CommentScreening.pm
===================================================================
--- trunk/cgi-bin/LJ/Setting/CommentScreening.pm	2011-01-21 09:55:04 UTC (rev 18080)
+++ trunk/cgi-bin/LJ/Setting/CommentScreening.pm	2011-01-21 10:18:21 UTC (rev 18081)
@@ -48,7 +48,7 @@
     my ($class, $u, $args) = @_;
 
     my $val = $class->get_arg($args, "commentscreening");
-    $val = "N" unless $val =~ /^[NRFLA]$/;
+    $val = "L" unless $val =~ /^[NRFLA]$/;
 
     $u->set_prop( opt_whoscreened => $val );
 

Modified: trunk/cgi-bin/LJ/Talk.pm
===================================================================
--- trunk/cgi-bin/LJ/Talk.pm	2011-01-21 09:55:04 UTC (rev 18080)
+++ trunk/cgi-bin/LJ/Talk.pm	2011-01-21 10:18:21 UTC (rev 18081)
@@ -348,17 +348,15 @@
     return 0 unless $remote;
     return 1 if $remote->{'user'} eq $u->{'user'} ||
                 $remote->{'user'} eq (ref $up ? $up->{'user'} : $up) ||
-                $remote->can_manage($u) || $remote->can_moderate($u);
+                $remote->can_manage($u);
     return 0;
 }
 
 sub can_unscreen {
-    return 0 if $_[0]->can_moderate($_[1]);
     return LJ::Talk::can_screen(@_);
 }
 
 sub can_view_screened {
-    return 0 if $_[0]->can_moderate($_[1]);
     return LJ::Talk::can_delete(@_);
 }
 
@@ -367,7 +365,6 @@
 }
 
 sub can_unfreeze {
-    return 1 if $_[0]->can_moderate($_[1]);
     return LJ::Talk::can_unscreen(@_);
 }
 
@@ -399,7 +396,7 @@
     # now return userprop, as it's our last chance
     LJ::load_user_props($journalu, 'opt_whoscreened');
     return if $journalu->{opt_whoscreened} eq 'N';
-    return $journalu->{opt_whoscreened};
+    return $journalu->{opt_whoscreened} || 'L';
 }
 
 sub update_commentalter {
@@ -1285,26 +1282,6 @@
         }
     }
 
-    # load first level and 3 first replies(or replies to replies)
-    if ($opts->{'expand_strategy'} eq 'mobile') {
-        undef @check_for_children;
-        foreach my $first_itemid (@top_replies) {
-            next unless $children{$first_itemid};
-            my @childrens = @{ $children{$first_itemid} };
-            my $load = $opts->{'expand_child'} || 3;
-            while( @childrens && $load > 0 ){
-                if ( @childrens >= $load ){
-                    push @posts_to_load, splice(@childrens, 0, $load);
-                    last;
-                }else{
-                    push @posts_to_load, @childrens;
-                    $load -= @childrens;
-                    @childrens = map {$children{$_}?@{$children{$_}}:()} @childrens;
-                }
-            }
-        }        
-    }
-    
     my (@subjects_to_load, @subjects_ignored);
     while (@check_for_children) {
         my $cfc = shift @check_for_children;

Modified: trunk/htdocs/update.bml
===================================================================
--- trunk/htdocs/update.bml	2011-01-21 09:55:04 UTC (rev 18080)
+++ trunk/htdocs/update.bml	2011-01-21 10:18:21 UTC (rev 18081)
@@ -284,7 +284,6 @@
         if ($remote) {
             $entry->{prop_opt_default_noemail} = $remote->prop('opt_gettalkemail');
             $entry->{prop_opt_default_nocomments} = $remote->prop('opt_showtalklinks');
-            $entry->{prop_opt_default_screening} = $remote->prop('opt_whoscreened');
             $entry->{prop_last_fm_user} = $remote->prop('last_fm_user');
         }