tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Some beautification

Browse source
This commit is contained in:
Michael Vogel 2016-03-02 23:39:50 +01:00 committed by Roland Haeder
parent 599d242e00
commit bad5a6e84a
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/diaspora2.php
View file

@ -1524,16 +1524,16 @@ print_r($data);
$body = diaspora2bb($raw_message); $body = diaspora2bb($raw_message);
if ($data->photo) $datarray = array();
if ($data->photo) {
foreach ($data->photo AS $photo) foreach ($data->photo AS $photo)
$body = "[img]".$photo->remote_photo_path.$photo->remote_photo_name."[/img]\n".$body; $body = "[img]".$photo->remote_photo_path.$photo->remote_photo_name."[/img]\n".$body;
$datarray = array();
if($data->photo->remote_photo_path AND $data->photo->remote_photo_name)
$datarray["object-type"] = ACTIVITY_OBJ_PHOTO; $datarray["object-type"] = ACTIVITY_OBJ_PHOTO;
else { } else {
$datarray["object-type"] = ACTIVITY_OBJ_NOTE; $datarray["object-type"] = ACTIVITY_OBJ_NOTE;
// Add OEmbed and other information to the body // Add OEmbed and other information to the body
if (!self::is_redmatrix($contact["url"])) if (!self::is_redmatrix($contact["url"]))
$body = add_page_info_to_body($body, false, true); $body = add_page_info_to_body($body, false, true);
@ -1541,6 +1541,7 @@ print_r($data);
$str_tags = ""; $str_tags = "";
// This doesn't work. @todo Check if the "tag" field is filled in the "item_store" function.
$cnt = preg_match_all("/@\[url=(.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER); $cnt = preg_match_all("/@\[url=(.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER);
if($cnt) { if($cnt) {
foreach($matches as $mtch) { foreach($matches as $mtch) {