diff options
author | Evan Prodromou <evan@status.net> | 2010-01-24 15:59:57 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-01-24 15:59:57 -0500 |
commit | 54ebb0a2b99aa1a9a6a27b61e47d12692ded65b4 (patch) | |
tree | 3e3a4826354925e8e3a6a8a9f64146415e844858 /plugins/UserFlag | |
parent | d25bd9b2923606a9e4786e8cab3c1bd384235164 (diff) | |
parent | 3f5ffe5c5be2290e157f6390952f75ec583b41c9 (diff) |
Merge branch 'master' into 0.9.x
Conflicts:
lib/stompqueuemanager.php
Diffstat (limited to 'plugins/UserFlag')
-rw-r--r-- | plugins/UserFlag/User_flag_profile.php | 11 |
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(); |