From af237cb12589acf3d3f206f0997d9940ae8aa531 Mon Sep 17 00:00:00 2001
From: Paul Driver <paul@plainblack.com>
Date: Wed, 3 Jun 2009 19:28:42 +0000
Subject: [PATCH] fixed #10266: Public Profile overrides Able to be friend

---
 docs/changelog/7.x.x.txt      |  1 +
 lib/WebGUI/Account/Profile.pm | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index f1d1f3a59..9588e1ddc 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.7.9
+ - fixed #10266: Public Profile overrides Able to be friend   
  - fixed #10211: Regex quantifiers like ? and + broke search engine
  - fixed #10261: editted tag in Default Contributions View Template
  - fixed #10450: A different errormessage is given if the username does exist and
diff --git a/lib/WebGUI/Account/Profile.pm b/lib/WebGUI/Account/Profile.pm
index 5f16d585c..00560b7e1 100644
--- a/lib/WebGUI/Account/Profile.pm
+++ b/lib/WebGUI/Account/Profile.pm
@@ -477,15 +477,21 @@ sub www_view {
 
     $var->{'can_edit_profile'  } = $uid eq $session->user->userId;
 
+    my $privacySetting = $user->profileField('publicProfile') || 'none';
+    $var->{"profile_privacy_$privacySetting"} = "true";
+
+    $var->{'acceptsPrivateMessages'} 
+        = $user->acceptsPrivateMessages($session->user->userId);
+
+    $var->{'acceptsFriendsRequests'} 
+        = $user->acceptsFriendsRequests($session->user);
+
     #Check user privileges
     unless ($user->profileIsViewable($session->user)) {
         my $i18n = WebGUI::International->new($session,'Account_Profile');
-        return $self->showError(
-            $var,
-            $i18n->get("profile not public error"),
-            $var->{'back_url'},
-            $self->getErrorTemplateId
-        );
+        $var->{'notViewable'}   = 1;
+        $var->{'error_message'} = $i18n->get("profile not public error");
+        return $self->processTemplate($var,$self->getViewTemplateId);
     }
 
     #Cache the privacy settings
@@ -529,12 +535,6 @@ sub www_view {
         $var->{'profile_category_loop'}->[0]->{'profile_category_isActive'} = 1;
     }
 
-    my $privacySetting                          = $user->profileField("publicProfile") || "none";
-    $var->{'profile_privacy_'.$privacySetting } = "true";
-
-    $var->{'acceptsPrivateMessages'} = $user->acceptsPrivateMessages($session->user->userId);
-    $var->{'acceptsFriendsRequests'} = $user->acceptsFriendsRequests($session->user);
-
     return $self->processTemplate($var,$self->getViewTemplateId);
 }