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

Avoid having to check for notices without rendered copies in upgrade.php

Browse Source 
Always call the Notice->getRendered() function to get a rendered copy.
We could perhaps put some sanitation there too in the future
This commit is contained in:
Mikael Nordfeldth
2016-01-06 15:32:00 +01:00
parent d6ac002639
commit b596391fcd
18 changed files with 32 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,7 +63,7 @@ class Fave extends Managed_DataObject
// notice's nickname and %3$s is the content of the favorited notice.)
$act->content = sprintf(_('%1$s favorited something by %2$s: %3$s'),
$actor->getNickname(), $target->getProfile()->getNickname(),
$target->rendered ?: $target->content);
$target->getRendered());
$act->actor = $actor->asActivityObject();
$act->target = $target->asActivityObject();
$act->objects = array(clone($act->target));
@@ -186,7 +186,7 @@ class Fave extends Managed_DataObject
// notice's nickname and %3$s is the content of the favorited notice.)
$act->content = sprintf(_('%1$s favorited something by %2$s: %3$s'),
$actor->getNickname(), $target->getProfile()->getNickname(),
$target->rendered ?: $target->content);
$target->getRendered());
$act->actor = $actor->asActivityObject();
$act->target = $target->asActivityObject();
@@ -343,7 +343,7 @@ class Fave extends Managed_DataObject
$actobj->objects = array(clone($actobj->target));
$actobj->verb = ActivityVerb::FAVORITE;
$actobj->title = ActivityUtils::verbToTitle($actobj->verb);
$actobj->content = $this->getTarget()->rendered ?: $this->getTarget()->content;
$actobj->content = $this->getTarget()->getRendered();
return $actobj;
}