Allow inviting OpenID accounts to join communities.
Patch by kareila.
diffs (38 lines):
diff -r f3b4f72cb8b5 -r a2f067a771a7 htdocs/community/members.bml
--- a/htdocs/community/members.bml Wed Apr 21 22:59:20 2010 +0000
+++ b/htdocs/community/members.bml Wed Apr 21 23:01:40 2010 +0000
@@ -109,7 +109,7 @@ body<=
next unless $given_user;
- my $target = LJ::load_user($given_user);
+ my $target = LJ::load_user_or_identity( $given_user );
unless ($target) {
push @add_errors, BML::ml( '.error.nouser',
{ user => $given_user } );
@@ -132,10 +132,10 @@ body<=
next;
}
- unless ( $target->is_person ) {
- push @add_errors, BML::ml( '.error.invaliduser',
+ unless ( $target->is_individual ) {
+ push @add_errors, BML::ml( '.error.invaliduser2',
{ user => $target_disp,
- type => $target->{'journaltype'}
} );
+ type =>
$target->journaltype_readable } );
next;
}
diff -r f3b4f72cb8b5 -r a2f067a771a7 htdocs/community/members.bml.text
--- a/htdocs/community/members.bml.text Wed Apr 21 22:59:20 2010 +0000
+++ b/htdocs/community/members.bml.text Wed Apr 21 23:01:40 2010 +0000
@@ -23,7 +23,7 @@
.error.alreadysent=[[user]] could not be added because they were already sent
a confirmation email on <i>[[datetime]]</i>. Please wait for them to respond.
-.error.invaliduser=Cannot add community or syndicated account: [[user]]
+.error.invaliduser2=Cannot add [[type]] account: [[user]]
.error.isminor=Sorry, but [[user]] cannot be invited to this community because
they do not have a registered birthday that is at least 18 years old.
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
