Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
8133e1ced2
3 changed files with 7 additions and 0 deletions
|
@ -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\">
|
||||
|
|
BIN
pumpio.tgz
BIN
pumpio.tgz
Binary file not shown.
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue