clones/friendica-addons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Michael Vogel 2013-10-20 13:01:06 +02:00
parent bd765efbd3 b4dc70b48a
commit 8133e1ced2
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jappixmini/jappixmini.php
View File

@ -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
View File

Binary file not shown.

3
pumpio/pumpio.php
View File

@ -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;