summaryrefslogtreecommitdiff
path: root/plugins/UserFlag
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-01-25 18:13:09 -0500
committerEvan Prodromou <evan@status.net>2010-01-25 18:13:09 -0500
commit663e4e02a1b3b1c104c2c3db19e524a486c3d981 (patch)
tree048e2f67c10f74e3b510646f7b955d45baa49253 /plugins/UserFlag
parent1ab24832960eef698731cf0d3e72fccfa336392d (diff)
parente26a843caf9f6bb0d11a7128884db235ededcce0 (diff)
Merge branch 'master' into testing
Conflicts: lib/queuemanager.php
Diffstat (limited to 'plugins/UserFlag')
-rw-r--r--plugins/UserFlag/User_flag_profile.php11
1 files changed, 10 insertions, 1 deletions
diff --git a/plugins/UserFlag/User_flag_profile.php b/plugins/UserFlag/User_flag_profile.php
index bc4251cf7..86b39160b 100644
--- a/plugins/UserFlag/User_flag_profile.php
+++ b/plugins/UserFlag/User_flag_profile.php
@@ -86,7 +86,7 @@ class User_flag_profile extends Memcached_DataObject
function keys()
{
- return array('profile_id' => 'N', 'user_id' => 'N');
+ return array('profile_id' => 'K', 'user_id' => 'K');
}
/**
@@ -130,6 +130,15 @@ class User_flag_profile extends Memcached_DataObject
return !empty($ufp);
}
+ /**
+ * Create a new flag
+ *
+ * @param integer $user_id ID of user who's flagging
+ * @param integer $profile_id ID of profile being flagged
+ *
+ * @return boolean success flag
+ */
+
static function create($user_id, $profile_id)
{
$ufp = new User_flag_profile();