[livejournal] r17184: LJSUP-6574: Identity accounts can't to j...

U   trunk/cgi-bin/communitylib.pl
U   trunk/htdocs/community/join.bml

Modified: trunk/cgi-bin/communitylib.pl
===================================================================
--- trunk/cgi-bin/communitylib.pl	2010-08-24 03:45:21 UTC (rev 17183)
+++ trunk/cgi-bin/communitylib.pl	2010-08-24 04:36:12 UTC (rev 17184)
@@ -344,7 +344,7 @@
     return LJ::error('comm_not_found') unless $u && $cu;
     return LJ::error('comm_not_comm') unless $cu->{journaltype} eq 'C';
 
-    return LJ::error(qq|Sorry, you aren't allowed to join communities until your email address has been validated. If you've lost the confirmation email to do this, you can <a href="http://www.livejournal.com/register.bml">have it re-sent.</a>|)
+    return LJ::error(qq|Sorry, you aren't allowed to join communities until your email address has been validated. If you've lost the confirmation email to do this, you can <a href="$LJ::SITEROOT/register.bml">have it re-sent.</a>|)
         unless $u->is_validated;
 
     # friend comm -> user

Modified: trunk/htdocs/community/join.bml
===================================================================
--- trunk/htdocs/community/join.bml	2010-08-24 03:45:21 UTC (rev 17183)
+++ trunk/htdocs/community/join.bml	2010-08-24 04:36:12 UTC (rev 17184)
@@ -19,7 +19,7 @@
 
     # make sure a community doesn't join a community
     return "<?h1 $ML{'Error'} h1?><?p $ML{'.label.commlogged'} p?>"
-        unless $remote->{'journaltype'} eq "P";
+        unless $remote->is_personal || $remote->is_identity;
 
     # get info about the community
 
@@ -30,7 +30,7 @@
         unless $cu;
 
     return "<?h1 $ML{'Error'} h1?><?p $ML{'.label.notcomm'} p?>"
-        unless $cu->{journaltype} eq "C";
+        unless $cu->is_community;
 
     return "<?h1 $ML{'Error'} h1?><?p $ML{'.label.locked'} p?>"
         if $cu->{statusvis} eq "L";