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

Nothing interesting was made in this commit.

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-03-01 16:30:00 +01:00
parent a112e7f9a4
commit e41809af89
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
classes/Attention.php
View File

@ -53,7 +53,7 @@ class Attention extends Managed_DataObject
{ {
try { try {
$att = Attention::getByKeys(['notice_id'=>$notice->getID(), 'profile_id'=>$target->getID()]); $att = Attention::getByKeys(['notice_id'=>$notice->getID(), 'profile_id'=>$target->getID()]);
throw new AlreadyFulfilledException('Attention already exists with reason: '.var_export($att->reason,true)); throw new AlreadyFulfilledException('Attention already exists with reason: '._ve($att->reason));
} catch (NoResultException $e) { } catch (NoResultException $e) {
$att = new Attention(); $att = new Attention();
@ -67,6 +67,7 @@ class Attention extends Managed_DataObject
throw new Exception('Failed Attention::saveNew for notice id=='.$notice->getID().' target id=='.$target->getID().', reason=="'.$reason.'"'); throw new Exception('Failed Attention::saveNew for notice id=='.$notice->getID().' target id=='.$target->getID().', reason=="'.$reason.'"');
} }
} }
self::blow('attention:stream:%d', $target->getID());
return $att; return $att;
} }
} }

2
classes/Notice.php
View File

@ -1647,8 +1647,6 @@ class Notice extends Managed_DataObject
} }
$att = Attention::saveNew($this, $target, $reason); $att = Attention::saveNew($this, $target, $reason);
self::blow('reply:stream:%d', $target->getID());
return true; return true;
} }