diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-01 23:56:13 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-01 23:56:13 -0400 |
| commit | 5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c (patch) | |
| tree | 5ce33b1595a2dd7d94e43ca9d2efc7be8facc94b /include/diaspora.php | |
| parent | 9472ba8d2031183cc9d573f27e02511c1c5a3050 (diff) | |
| parent | 5d35f0d54a52801dd9a17d4e44c294e4c9168de3 (diff) | |
| download | volse-hubzilla-5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c.tar.gz volse-hubzilla-5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c.tar.bz2 volse-hubzilla-5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
add title to D* posts
allow users to set categories on their posts
Modified peopleyouknow to handle sites without Facebook better
diabook-themes: add link to global dir in "find friends" at right_aside
modified: mod/newmember.php
New user quick start.
check for style.php existence before inclusion
Moved Diaspora notes away from top, per user request
* master:
Diffstat (limited to 'include/diaspora.php')
| -rwxr-xr-x | include/diaspora.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index 104ccadf2..04238f17c 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1920,6 +1920,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { $images = array(); + $title = $item['title']; $body = $item['body']; /* @@ -1944,9 +1945,12 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { } } */ - $body = xmlify(html_entity_decode(bb2diaspora($body))); + if(strlen($title)) + $body = xmlify('**' . html_entity_decode($title) . '**' . "\n") . $body; + + if($item['attach']) { $cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism',$item['attach'],$matches,PREG_SET_ORDER); if(cnt) { |