summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-12-29 12:09:17 -0800
committerEvan Prodromou <evan@status.net>2009-12-29 12:09:17 -0800
commit05e2b4d92d9e646ac17871424d47e81c09acf4b2 (patch)
tree7f93a74fe8252daf165d148bdb10203244a8931f /plugins
parenta1e599640419bd1ea1f251b9e19e50522bda4de5 (diff)
parent45c4078ca9de2f8f107e3c4a7cb759ac9cb2664a (diff)
Merge branch 'master' into 0.9.x
Diffstat (limited to 'plugins')
-rw-r--r--plugins/UserFlag/UserFlagPlugin.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php
index 0fca5f9cf..602a5bfa8 100644
--- a/plugins/UserFlag/UserFlagPlugin.php
+++ b/plugins/UserFlag/UserFlagPlugin.php
@@ -251,7 +251,9 @@ class UserFlagPlugin extends Plugin
function onEndBlockProfile($user, $profile)
{
- if ($this->flagOnBlock) {
+ if ($this->flagOnBlock && !User_flag_profile::exists($profile->id,
+ $user->id)) {
+
User_flag_profile::create($user->id, $profile->id);
}
return true;