merge to 10219

This commit is contained in:
Colin Kuskie 2009-04-08 16:35:31 +00:00
parent ae28bf79c8
commit 4c1307e3d0
194 changed files with 8203 additions and 2134 deletions

View file

@ -232,7 +232,7 @@ sub getLayoutTemplateId {
#-------------------------------------------------------------------
=head2 getConfirmTemplateId ( )
=head2 getRemoveConfirmTemplateId ( )
This method returns the template ID for the confirmation screen.
@ -484,17 +484,13 @@ sub www_view {
my $var = {};
my $uid = $self->uid;
my $user = ($uid) ? WebGUI::User->new($session,$uid) : $session->user;
my $user = $self->getUser;
$self->appendCommonVars($var);
my $displayView = $uid ne "";
$var->{'display_message'} = $msg;
#Override these
$var->{'user_full_name' } = $user->getWholeName;
$var->{'user_member_since' } = $user->dateCreated;
unless ($user->profileField('ableToBeFriend') && $user->profileIsViewable($session->user)) {
my $i18n = WebGUI::International->new($session,"Account_Friends");
my $errorMsg = "";