Daisychaining bug with exceptions in PHP

diff --git a/lib/apiaction.php b/lib/apiaction.php
index 354e1887bb8d06c0532cd2e2e04ecbe7adb41c90..481dcf1b9529a23e7fb6ca04dc1e70eb10f0d8ed 100644 (file)
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -315,7 +315,10 @@ class ApiAction extends Action
         $twitter_status['truncated'] = false; # Not possible on StatusNet
         $twitter_status['created_at'] = $this->dateTwitter($notice->created);
         try {
-            $in_reply_to = $notice->getParent()->id;
+            // We could just do $notice->reply_to but maybe the future holds a
+            // different story for parenting.
+            $parent = $notice->getParent();
+            $in_reply_to = $parent->id;
         } catch (Exception $e) {
             $in_reply_to = null;
         }

diff --git a/lib/implugin.php b/lib/implugin.php
index def9a942c90b27620053f0b826c26a072a00f0ca..4ee9d854663e22cd240df05d189da15b28a938b4 100644 (file)
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -375,7 +375,8 @@ abstract class ImPlugin extends Plugin
         $profile = $notice->getProfile();
 
         try {
-            $orig_profile = $notice->getParent()->getProfile();
+            $parent = $notice->getParent();
+            $orig_profile = $parent->getProfile();
             $nicknames = sprintf('%1$s => %2$s', $profile->nickname, $orig_profile->nickname);
         } catch (Exception $e) {
             $nicknames = $profile->nickname;