Merge pull request #1005 from MrPetovan/task/8676-ap-multiple-link-image
[various] Rename PageInfo::appendToBody to searchAndAppendToBodypull/1007/head
commit
31bd1a1ba0
|
@ -897,7 +897,7 @@ function statusnet_fetchtimeline(App $a, $uid)
|
||||||
|
|
||||||
$_REQUEST["title"] = "";
|
$_REQUEST["title"] = "";
|
||||||
|
|
||||||
$_REQUEST["body"] = PageInfo::appendToBody($post->text, true);
|
$_REQUEST["body"] = PageInfo::searchAndAppendToBody($post->text, true);
|
||||||
if (is_string($post->place->name)) {
|
if (is_string($post->place->name)) {
|
||||||
$_REQUEST["location"] = $post->place->name;
|
$_REQUEST["location"] = $post->place->name;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1365,11 +1365,11 @@ function twitter_expand_entities($body, stdClass $status, $picture)
|
||||||
} elseif ($picture) {
|
} elseif ($picture) {
|
||||||
$body .= "\n\n[img]" . $picture . "[/img]\n";
|
$body .= "\n\n[img]" . $picture . "[/img]\n";
|
||||||
} else {
|
} else {
|
||||||
$body = PageInfo::appendToBody($body);
|
$body = PageInfo::searchAndAppendToBody($body);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return ['body' => $body, 'plain' => $plain, 'taglist' => $taglist];
|
return ['body' => $body, 'plain' => trim($plain), 'taglist' => $taglist];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue