diff options
-rw-r--r-- | doc/roadmap.bb | 2 | ||||
-rw-r--r-- | doc/to_do_code.bb | 2 | ||||
-rw-r--r-- | include/ItemObject.php | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/roadmap.bb b/doc/roadmap.bb index e38f5a981..0244bfcf4 100644 --- a/doc/roadmap.bb +++ b/doc/roadmap.bb @@ -36,7 +36,7 @@ Lists Create a list object to contain arbitrary things for personal use Events - Recurring events and participation (RSVP) + Recurring events Zot Provide a way to sync web resources. This could be built on DAV except for preserving resource naming (guids) instead of filenames. diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb index 0dd0b8e24..5a5ae76fd 100644 --- a/doc/to_do_code.bb +++ b/doc/to_do_code.bb @@ -23,7 +23,7 @@ We need much more than this, but here are areas where developers can help. Pleas [li]service classes - provide a pluggable subscription payment gateway for premium accounts[/li]
[li]service classes - account overview page showing resources consumed by channel. With special consideration this page can also be accessed at a meta level by the site admin to drill down on problematic accounts/channels.[/li]
[li]Events module - fix permissions on events, and provide JS translation support for the calendar overview; integrate with calDAV[/li]
-[li]Events module - event followups and RSVP[/li]
+[li]Events module - event followups[/li]
[li]Uploads - integrate #^[url=https://github.com/blueimp/jQuery-File-Upload]https://github.com/blueimp/jQuery-File-Upload[/url][/li]
[li]Import/export - include events, things, etc.[/li]
[li]Import channel from Diaspora/Friendica[/li]
diff --git a/include/ItemObject.php b/include/ItemObject.php index 7f5ee83a3..9dc364f9e 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -141,7 +141,7 @@ class Item extends BaseObject { $response_verbs = array('like'); if(feature_enabled($conv->get_profile_owner(),'dislike')) $response_verbs[] = 'dislike'; - if($item['obj_type'] === ACTIVITY_OBJ_EVENT) { + if($item['obj_type'] === ACTIVITY_OBJ_EVENT && $this->is_commentable) { $response_verbs[] = 'attendyes'; $response_verbs[] = 'attendno'; $response_verbs[] = 'attendmaybe'; @@ -149,7 +149,7 @@ class Item extends BaseObject { $attend = array( t('I will attend'), t('I will not attend'), t('I might attend')); } - $consensus = (($item['item_flags'] & ITEM_CONSENSUS)? true : false); + $consensus = ((($item['item_flags'] & ITEM_CONSENSUS) && $this->is_commentable) ? true : false); if($consensus) { $response_verbs[] = 'agree'; $response_verbs[] = 'disagree'; |