wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for ticket #2168: if we've already flagged a profile from another window, let the 'Flag' form submission gracefully show the updated state instead of throwing an error (error message isn't even exposed properly in AJAX submissions)

Browse Source
This commit is contained in:
Brion Vibber 2010-11-03 12:32:11 -07:00
parent 607d958977
commit 5592333b73
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/UserFlag/flagprofile.php
View File

@ -60,13 +60,6 @@ class FlagprofileAction extends ProfileFormAction
assert(!empty($user)); // checked above
assert(!empty($this->profile)); // checked above
if (User_flag_profile::exists($this->profile->id,
$user->id)) {
// TRANS: Client error when setting flag that has already been set for a profile.
$this->clientError(_m('Flag already exists.'));
return false;
}
return true;
}
@ -104,7 +97,13 @@ class FlagprofileAction extends ProfileFormAction
// throws an exception on error
User_flag_profile::create($user->id, $this->profile->id);
if (User_flag_profile::exists($this->profile->id,
$user->id)) {
// We'll return to the profile page (or return the updated AJAX form)
// showing the current state, so no harm done.
} else {
User_flag_profile::create($user->id, $this->profile->id);
}
if ($this->boolean('ajax')) {
$this->ajaxResults();