Issue 1733 / 1735 - Eliminate special casing for PMs to minor accounts

Changed minor accounts to receive PMs from all registered users. Fixed call when checking whether a PM can be sent.
dreamwidth · Jul 15, 2016 · c5f60dd · c5f60dd
1 parent e2141a1
commit c5f60dd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/cgi-bin/LJ/Setting/UserMessaging.pm b/cgi-bin/LJ/Setting/UserMessaging.pm
@@ -32,7 +32,7 @@ sub option {
     my ($class, $u, $errs, $args) = @_;
     my $key = $class->pkgkey;
 
-    my $usermsg = $class->get_arg($args, "usermsg") || $u->prop("opt_usermsg");
+    my $usermsg = $class->get_arg($args, "usermsg") || $u->opt_usermsg;
 
     my @options = (
         "Y" => $class->ml( 'setting.usermessaging.opt.y' ),

diff --git a/cgi-bin/LJ/User/Message.pm b/cgi-bin/LJ/User/Message.pm
@@ -424,7 +424,6 @@ sub opt_usermsg {
     if ( defined $prop && $prop =~ /^(Y|F|M|N)$/ ) {
         return $prop;
     } else {
-        return 'M' if $u->is_minor;
         return 'Y';
     }
 }