GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Fave deletion would fail in some cases with missing profiles or notices

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-01-03 22:35:49 +01:00
parent 7266a968f9
commit bda30a92bc
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
plugins/Favorite/classes/Fave.php
View File

@ -114,24 +114,38 @@ class Fave extends Managed_DataObject
public function delete($useWhere=false) public function delete($useWhere=false)
{ {
$profile = Profile::getKV('id', $this->user_id);
$notice = Notice::getKV('id', $this->notice_id);
$result = null; $result = null;
if (Event::handle('StartDisfavorNotice', array($profile, $notice, &$result))) { try {
$profile = $this->getActor();
$notice = $this->getTarget();
if (Event::handle('StartDisfavorNotice', array($profile, $notice, &$result))) {
$result = parent::delete($useWhere);
self::blowCacheForProfileId($this->user_id);
self::blowCacheForNoticeId($this->notice_id);
self::blow('popular');
if ($result !== false) {
Event::handle('EndDisfavorNotice', array($profile, $notice));
}
}
} catch (NoResultException $e) {
common_log(LOG_INFO, '"'.get_class($e->obj).'" with id=='.var_export($e->obj->id, true).' object not found when deleting favorite, ignoring...');
// Delete it without the event, as something is wrong and we don't want it anyway.
$result = parent::delete($useWhere); $result = parent::delete($useWhere);
self::blowCacheForProfileId($this->user_id); self::blowCacheForProfileId($this->user_id);
self::blowCacheForNoticeId($this->notice_id); self::blowCacheForNoticeId($this->notice_id);
self::blow('popular'); self::blow('popular');
if ($result) {
Event::handle('EndDisfavorNotice', array($profile, $notice));
}
} }
return $result; return $result;
} }
@ -391,14 +405,7 @@ class Fave extends Managed_DataObject
public function getTarget() public function getTarget()
{ {
// throws exception on failure return Notice::getByID($this->notice_id);
$target = new Notice();
$target->id = $this->notice_id;
if (!$target->find(true)) {
throw new NoResultException($target);
}
return $target;
} }
public function getTargetObject() public function getTargetObject()