From 509109a71a7aebd028dffb053a888cc48826b6b9 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 7 Nov 2009 13:22:07 -0500 Subject: [PATCH] make sure FlagprofileAction without Profile_flag --- plugins/UserFlag/flagprofile.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/plugins/UserFlag/flagprofile.php b/plugins/UserFlag/flagprofile.php index f128b9c40e..c72b74c6a1 100644 --- a/plugins/UserFlag/flagprofile.php +++ b/plugins/UserFlag/flagprofile.php @@ -81,19 +81,12 @@ class FlagprofileAction extends Action return false; } - $this->flag = $this->trimmed('flag'); - - if (empty($this->flag)) { - $this->flag = Profile_flag::DEFAULTFLAG; - } - $user = common_current_user(); assert(!empty($user)); // checked above if (User_flag_profile::exists($this->profile->id, - $user->id, - $this->flag)) + $user->id)) { $this->clientError(_('Flag already exists.')); return false; @@ -134,13 +127,11 @@ class FlagprofileAction extends Action assert(!empty($user)); assert(!empty($this->profile)); - assert(!empty($this->flag)); $ufp = new User_flag_profile(); $ufp->profile_id = $this->profile->id; $ufp->user_id = $user->id; - $ufp->flag = $this->flag; $ufp->created = common_sql_now(); if (!$ufp->insert()) {