friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #5967 from annando/ap-nick 

Fix function naming
This commit is contained in:
Hypolite Petovan 2018-10-19 10:38:51 -04:00 committed by GitHub
parent ec0d3a6eac bedab33e0b
commit f104817967
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Protocol/ActivityPub/Transmitter.php
View File

@ -749,7 +749,7 @@ class Transmitter
* @param array $match Matching values for the callback * @param array $match Matching values for the callback
* @return string Replaced mention * @return string Replaced mention
*/ */
private static function MentionCallback($match) private static function mentionCallback($match)
{ {
if (empty($match[1])) { if (empty($match[1])) {
return; return;
@ -872,7 +872,7 @@ class Transmitter
} }
$regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism"; $regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
$body = preg_replace_callback($regexp, ['self', 'MentionCallback'], $body); $body = preg_replace_callback($regexp, ['self', 'mentionCallback'], $body);
$data['content'] = BBCode::convert($body, false, 7); $data['content'] = BBCode::convert($body, false, 7);
$data['source'] = ['content' => $item['body'], 'mediaType' => "text/bbcode"]; $data['source'] = ['content' => $item['body'], 'mediaType' => "text/bbcode"];