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

Exception wasn't thrown. How does PHP handle daisychained calls, really?

Browse Source
This commit is contained in:
Mikael Nordfeldth 2013-10-21 09:09:32 +02:00
parent c70a519555
commit df5aa6f93a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
classes/Notice.php
View File

@ -1317,7 +1317,8 @@ class Notice extends Managed_DataObject
// If it's a reply, save for the replied-to author // If it's a reply, save for the replied-to author
try { try {
$author = $this->getParent()->getProfile(); $parent = $this->getParent();
$author = $parent->getProfile();
if ($author instanceof Profile) { if ($author instanceof Profile) {
$this->saveReply($author->id); $this->saveReply($author->id);
$replied[$author->id] = 1; $replied[$author->id] = 1;

3
plugins/Xmpp/XmppPlugin.php
View File

@ -346,7 +346,8 @@ class XmppPlugin extends ImPlugin
$xs->elementStart('body', array('xmlns' => 'http://www.w3.org/1999/xhtml')); $xs->elementStart('body', array('xmlns' => 'http://www.w3.org/1999/xhtml'));
$xs->element('a', array('href' => $profile->profileurl), $profile->nickname); $xs->element('a', array('href' => $profile->profileurl), $profile->nickname);
try { try {
$orig_profile = $notice->getParent()->getProfile(); $parent = $notice->getParent();
$orig_profile = $parent->getProfile();
$orig_profurl = $orig_profile->getUrl(); $orig_profurl = $orig_profile->getUrl();
$xs->text(" => "); $xs->text(" => ");
$xs->element('a', array('href' => $orig_profurl), $orig_profile->nickname); $xs->element('a', array('href' => $orig_profurl), $orig_profile->nickname);