Browse Source

Merge pull request #1005 from MrPetovan/task/8676-ap-multiple-link-image

[various] Rename PageInfo::appendToBody to searchAndAppendToBody
pull/1007/head
Michael Vogel 2 years ago
committed by GitHub
parent
commit
31bd1a1ba0
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      statusnet/statusnet.php
  2. 4
      twitter/twitter.php

2
statusnet/statusnet.php

@ -897,7 +897,7 @@ function statusnet_fetchtimeline(App $a, $uid)
$_REQUEST["title"] = "";
$_REQUEST["body"] = PageInfo::appendToBody($post->text, true);
$_REQUEST["body"] = PageInfo::searchAndAppendToBody($post->text, true);
if (is_string($post->place->name)) {
$_REQUEST["location"] = $post->place->name;
}

4
twitter/twitter.php

@ -1365,11 +1365,11 @@ function twitter_expand_entities($body, stdClass $status, $picture)
} elseif ($picture) {
$body .= "\n\n[img]" . $picture . "[/img]\n";
} 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…
Cancel
Save