diff options
author | Sarven Capadisli <csarven@status.net> | 2010-01-26 01:58:58 +0100 |
---|---|---|
committer | Sarven Capadisli <csarven@status.net> | 2010-01-26 01:58:58 +0100 |
commit | 687b1719d1acd782eb9ecf36e406bc03d2d6e299 (patch) | |
tree | 3f921b41fcee1e99c070d26474b0de3faa0673d6 /plugins | |
parent | d17b7fa19ba2bfec9aa3d734c0f30e001256ddc0 (diff) | |
parent | 663e4e02a1b3b1c104c2c3db19e524a486c3d981 (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/Facebook/facebookaction.php | 2 | ||||
-rw-r--r-- | plugins/UserFlag/User_flag_profile.php | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php index bf9c037a5..815fee094 100644 --- a/plugins/Facebook/facebookaction.php +++ b/plugins/Facebook/facebookaction.php @@ -397,7 +397,7 @@ class FacebookAction extends Action return; } - common_broadcast_notice($notice); + } 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(); |