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

Profile->getCurrentNotice handles PrivateStreamException

This commit is contained in:
Mikael Nordfeldth 2016-01-04 21:38:41 +01:00
parent de7e8c59e8
commit 6a16939830
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
classes/Profile.php
View File

@ -235,14 +235,20 @@ class Profile extends Managed_DataObject
*/
function getCurrentNotice()
{
$notice = $this->getNotices(0, 1);
try {
$notice = $this->getNotices(0, 1);
if ($notice->fetch()) {
if ($notice instanceof ArrayWrapper) {
// hack for things trying to work with single notices
return $notice->_items[0];
if ($notice->fetch()) {
if ($notice instanceof ArrayWrapper) {
// hack for things trying to work with single notices
// ...but this shouldn't happen anymore I think. Keeping it for safety...
return $notice->_items[0];
}
return $notice;
}
return $notice;
} catch (PrivateStreamException $e) {
// Maybe we should let this through if it's handled well upstream
return null;
}
return null;