1
0
Fork 0

Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop

This commit is contained in:
Roland Häder 2016-03-12 18:50:14 +01:00
commit c60605ce0c
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
50 changed files with 2266 additions and 1619 deletions

View file

@ -207,7 +207,7 @@ function ping_init(&$a) {
call_hooks('ping_xmlize', $n);
$notsxml = '<note id="%d" href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" timestamp="%s" >%s</note>'."\n";
return sprintf ( $notsxml, intval($n['id']),
xmlify($n['href']), xmlify($n['name']), xmlify($n['url']), xmlify($n['photo']),
xmlify($n['href']), xmlify(xmlify($n['name'])), xmlify($n['url']), xmlify($n['photo']),
xmlify(relative_date($n['date'])), xmlify($n['seen']), xmlify(strtotime($local_time)),
xmlify($n['message'])
);