diff options
| author | Michael <icarus@dabo.de> | 2012-06-18 08:51:12 +0200 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-06-18 08:51:12 +0200 |
| commit | 6eaca19f4195a5f8f2c1b6b1e51c6e52bad67d96 (patch) | |
| tree | 2dd0bdf8d76dac54b69c2abdf7be661146fd630b /include/diaspora.php | |
| parent | d53414a333964026c26c3acee0d953e742a9a633 (diff) | |
| parent | cc56f33b80bdd871b8a1245e3c4bd3a31ed49330 (diff) | |
| download | volse-hubzilla-6eaca19f4195a5f8f2c1b6b1e51c6e52bad67d96.tar.gz volse-hubzilla-6eaca19f4195a5f8f2c1b6b1e51c6e52bad67d96.tar.bz2 volse-hubzilla-6eaca19f4195a5f8f2c1b6b1e51c6e52bad67d96.zip | |
Merge branch 'master' of github.com:annando/friendica
Conflicts:
include/oembed.php
Diffstat (limited to 'include/diaspora.php')
| -rwxr-xr-x | include/diaspora.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index 2be266e8a..bd3851156 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2060,12 +2060,12 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { $images[] = $detail; $body = str_replace($detail['str'],$mtch[1],$body); } - } + } */ - $body = xmlify(html_entity_decode(bb2diaspora($body))); - if(strlen($title)) - $body = xmlify('**' . html_entity_decode($title) . '**' . "\n") . $body; + $body = "[b]".html_entity_decode($title)."[/b]\n\n".$body; + + $body = xmlify(html_entity_decode(bb2diaspora($body))); if($item['attach']) { |