[dw-free] /network does not properly check for account status

[afuna]

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

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

Fix logic so that /network respects the account capabilities.

Patch by afuna.

Files modified:

• bin/upgrading/en.dat
• cgi-bin/LJ/User.pm

--------------------------------------------------------------------------------
diff -r abc9470ac619 -r fe603fcafd7b bin/upgrading/en.dat
--- a/bin/upgrading/en.dat	Wed Jun 24 14:24:13 2009 +0000
+++ b/bin/upgrading/en.dat	Wed Jun 24 15:44:15 2009 +0000
@@ -302,7 +302,7 @@ cprod.friendsfriendsinline.text2.v4=
 
 cprod.friendsfriendsinline.text2.v5=
 
-cprod.friendsfriendsinline.text3.v1=Sorry, this account type does not permit showing friends of friends.
+cprod.friendsfriendsinline.text3.v1=Sorry, this account type does not permit showing your network.
 
 cprod.friendsfriendsinline.text3.v2=
 
diff -r abc9470ac619 -r fe603fcafd7b cgi-bin/LJ/User.pm
--- a/cgi-bin/LJ/User.pm	Wed Jun 24 14:24:13 2009 +0000
+++ b/cgi-bin/LJ/User.pm	Wed Jun 24 15:44:15 2009 +0000
@@ -8443,12 +8443,12 @@ sub make_journal
         $opts->{'badargs'} = 1; # Output a generic 'bad URL' message if available
         return "<h1>Notice</h1><p>This account isn't a community journal.</p>";
     }
-    if ($view eq "friendsfriends" && ! LJ::get_cap($u, "friendsfriendsview")) {
+    if ($view eq "network" && ! LJ::get_cap($u, "friendsfriendsview")) {
         my $inline;
         if ($inline .= LJ::run_hook("cprod_inline", $u, 'FriendsFriendsInline')) {
             return $inline;
         } else {
-            return BML::ml('cprod.friendsfriendsinline.text.v1');
+            return BML::ml('cprod.friendsfriendsinline.text3.v1');
         }
     }
 
--------------------------------------------------------------------------------