From 6ef6348b3d0dd5c8b0d2ada9e52798ea65cb3b13 Mon Sep 17 00:00:00 2001
From: Frank Dillon <frank@plainblack.com>
Date: Tue, 18 Nov 2008 21:55:52 +0000
Subject: [PATCH] removed contentPosition filters as they are not needed.

---
 lib/WebGUI/Account/Profile.pm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/WebGUI/Account/Profile.pm b/lib/WebGUI/Account/Profile.pm
index 80c148db8..a8fbb4c2b 100644
--- a/lib/WebGUI/Account/Profile.pm
+++ b/lib/WebGUI/Account/Profile.pm
@@ -359,17 +359,23 @@ sub www_edit {
         my @fields = ();
         use Data::Dumper;
         foreach my $field (@{ $category->getFields( { editable => 1 } ) }) {
-            next if $field->getId =~ m/contentPositions/; #This protects the contentPosition fields
             my $fieldId      = $field->getId;
             my $fieldLabel   = $field->getLabel;
             my $fieldForm    = $field->formField({ extras=>$self->getExtrasStyle($field,\@errorFields,$user->profileField($fieldId)) });
             my $fieldSubtext = $field->isRequired ? "*" : undef;
             my $fieldExtras  = $field->getExtras;
+            my $fieldPrivacy = WebGUI::Form::radoList($session,{
+                name    => "privacy_$fieldId",
+                options => $field->getPrivacyOptions($session),
+                value   => $user->getProfileFieldPrivacySetting($fieldId)
+            });
+
             #Create a seperate template var for each field
             $var->{'profile_field_'.$fieldId.'_form'   } = $fieldForm;
             $var->{'profile_field_'.$fieldId.'_label'  } = $fieldLabel;
             $var->{'profile_field_'.$fieldId.'_subtext'} = $fieldSubtext;
             $var->{'profile_field_'.$fieldId.'_extras' } = $fieldExtras;
+            $var->{'profile_field_'.$fieldId.'_privacy'} = $fieldPrivacy;
             
             push(@fields, {
                 'profile_field_id'      => $fieldId,
@@ -377,6 +383,7 @@ sub www_edit {
 				'profile_field_label'   => $fieldLabel,
 				'profile_field_subtext' => $field->isRequired ? "*" : undef,
                 'profile_field_extras'  => $field->getExtras,
+                'profile_field_privacy' => $fieldPrivacy,
 			});
         }
 
@@ -466,7 +473,6 @@ sub www_view {
 	foreach my $category (@{WebGUI::ProfileCategory->getCategories($session,{ visible => 1})}) {
         my @fields = ();
         foreach my $field (@{$category->getFields({ visible => 1 })}) {
-            next if $field->getId =~ m/contentPositions/; #This protects the contentPosition fields
             my $fieldId      = $field->getId;
             my $fieldLabel   = $field->getLabel;
             my $fieldValue   = $field->formField(undef,2,$user);