Don't accept non-objects before testing with "instanceof".

[quix0rs-gnu-social.git] / plugins / OStatus / lib / pushinqueuehandler.php

diff --git a/plugins/OStatus/lib/pushinqueuehandler.php b/plugins/OStatus/lib/pushinqueuehandler.php
index 1fd29ae301b9203595016b4210550260507efde8..ac8a6c84298a7423c94bad50c16576d4f650da48 100644 (file)
--- a/plugins/OStatus/lib/pushinqueuehandler.php
+++ b/plugins/OStatus/lib/pushinqueuehandler.php
@@ -17,12 +17,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
 /**
  * Process a feed distribution POST from a PuSH hub.
  * @package FeedSub
  * @author Brion Vibber <brion@status.net>
  */
-
 class PushInQueueHandler extends QueueHandler
 {
     function transport()
@@ -38,8 +41,8 @@ class PushInQueueHandler extends QueueHandler
         $post = $data['post'];
         $hmac = $data['hmac'];
 
-        $feedsub = FeedSub::staticGet('id', $feedsub_id);
-        if ($feedsub) {
+        $feedsub = FeedSub::getKV('id', $feedsub_id);
+        if ($feedsub instanceof FeedSub) {
             try {
                 $feedsub->receive($post, $hmac);
             } catch(Exception $e) {