diff options
| author | zottel <github@zottel.net> | 2012-04-02 08:52:24 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-02 08:52:24 +0200 |
| commit | 7127626f55f0ae5843d38145bf80022b98e4a8d8 (patch) | |
| tree | 59813e196f7288be421cf187c2231adedca7d4b6 /include/diaspora.php | |
| parent | f39e8126773e2a030cf84c8b9d428cc78546c1b9 (diff) | |
| parent | 1f74bd1b78f7db4940f0fded0d6f7716579218f0 (diff) | |
| download | volse-hubzilla-7127626f55f0ae5843d38145bf80022b98e4a8d8.tar.gz volse-hubzilla-7127626f55f0ae5843d38145bf80022b98e4a8d8.tar.bz2 volse-hubzilla-7127626f55f0ae5843d38145bf80022b98e4a8d8.zip | |
Merge remote branch 'upstream/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) { |