eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Use "newer" terminology and throw exceptions

Browse Source
This commit is contained in:
Mikael Nordfeldth
2016-01-19 00:21:16 +01:00
parent 9eea255c79
commit 73992a1ed8
4 changed files with 16 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/Event/classes/RSVP.php
View File

@@ -127,7 +127,7 @@ class RSVP extends Managed_DataObject
function saveNew($profile, $event, $verb, $options=array())
{
$eventNotice = $event->getNotice();
$eventNotice = $event->getStored();
$options = array_merge(array('source' => 'web'), $options);
$act = new Activity();
@@ -235,7 +235,7 @@ class RSVP extends Managed_DataObject
static function fromNotice(Notice $notice)
{
$rsvp = new RSVP();
$rsvp->uri = $notice->uri;
$rsvp->uri = $notice->getUri();
if (!$rsvp->find(true)) {
throw new NoResultException($rsvp);
}
@@ -354,8 +354,7 @@ class RSVP extends Managed_DataObject
// TRANS: Used as: Username [is [not ] attending|might attend] an unknown event.
$eventTitle = _m('an unknown event');
} else {
$notice = $event->getNotice();
$eventUrl = $notice->getUrl();
$eventUrl = $event->getStored()->getUrl();
$eventTitle = $event->title;
}
@@ -398,7 +397,6 @@ class RSVP extends Managed_DataObject
// TRANS: Used as: Username [is [not ] attending|might attend] an unknown event.
$eventTitle = _m('an unknown event');
} else {
$notice = $event->getNotice();
$eventTitle = $event->title;
}