Merge pull request #157 from annando/master

Bidirectional twitter sync - and some small fixes

diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index adbea67551c90a6cf583e5e5d26a89fdc045494e..aedbffd0d0d4249999311904d7ad1470b061a058 100644 (file)
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -499,6 +499,10 @@ function jappixmini_script(&$a,&$s) {
     $r = q("SELECT `username` FROM `user` WHERE `uid`=$uid");
     $nickname = json_encode($r[0]["username"]);
     $groupchats = get_config('jappixmini','groupchats');
+    //if $groupchats has no value jappix_addon_start will produce a syntax error
+    if(!isset($groupchats)){
+       $groupchats = "{}";
+    }
 
     // add javascript to start Jappix Mini
     $a->page['htmlhead'] .= "<script type=\"text/javascript\">

diff --git a/pumpio.tgz b/pumpio.tgz
index 2441430798781e2cf252d7a95253b4e88aa61502..9f58096647361e2e43a52cf257f9c6e3519ea7a4 100644 (file)
Binary files a/pumpio.tgz and b/pumpio.tgz differ

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index f7e01dc24f636a0ca6b75e37f7f0e7e8f46109e7..1f76c10085458c6616a1b92aef097a6a2f97a60a 100755 (executable)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -1084,14 +1084,17 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
                        }
                }
 
+               $reply = new stdClass;
                $reply->verb = "note";
                $reply->cc = $post->cc;
                $reply->to = $post->to;
+               $reply->object = new stdClass;
                $reply->object->objectType = $post->object->inReplyTo->objectType;
                $reply->object->content = $post->object->inReplyTo->content;
                $reply->object->id = $post->object->inReplyTo->id;
                $reply->actor = $post->object->inReplyTo->author;
                $reply->url = $post->object->inReplyTo->url;
+               $reply->generator = new stdClass;
                $reply->generator->displayName = "pumpio";
                $reply->published = $post->object->inReplyTo->published;
                $reply->received = $post->object->inReplyTo->updated;