diff options
author | Friendika <info@friendika.com> | 2011-10-23 19:06:04 -0700 |
---|---|---|
committer | Friendika <info@friendika.com> | 2011-10-23 19:06:04 -0700 |
commit | fe2c8a18454253df09f20c8821d7d6e14c0ea8e0 (patch) | |
tree | 0b92b6911bc718be7f4ac62eb87fadf3c9e0d094 /include/diaspora.php | |
parent | 7cbb69d87f1cadaaf2f252e6cfb0963011d66556 (diff) | |
parent | 3512adda33328e8fbc9ccc810d2caf22513589a2 (diff) | |
download | volse-hubzilla-fe2c8a18454253df09f20c8821d7d6e14c0ea8e0.tar.gz volse-hubzilla-fe2c8a18454253df09f20c8821d7d6e14c0ea8e0.tar.bz2 volse-hubzilla-fe2c8a18454253df09f20c8821d7d6e14c0ea8e0.zip |
Merge branch 'master' into tag
Diffstat (limited to 'include/diaspora.php')
-rw-r--r-- | include/diaspora.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index fa5973e7b..2379ae8e3 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1376,6 +1376,14 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { $body = $item['body']; +/* + // We're trying to match Diaspora's split message/photo protocol but + // all the photos are displayed on D* as links and not img's - even + // though we're sending pretty much precisely what they send us when + // doing the same operation. + // Commented out for now, we'll use bb2diaspora to convert photos to markdown + // which seems to get through intact. + $cnt = preg_match_all('|\[img\](.*?)\[\/img\]|',$body,$matches,PREG_SET_ORDER); if($cnt) { foreach($matches as $mtch) { @@ -1389,6 +1397,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { $body = str_replace($detail['str'],$mtch[1],$body); } } +*/ $body = xmlify(html_entity_decode(bb2diaspora($body))); |