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

Refactor comments including "bbcode()"

This commit is contained in:
Hypolite Petovan 2018-02-14 22:00:43 -05:00
parent 4e4f5862b2
commit 05a2ea4220
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/bb2diaspora.php
View File

@ -145,7 +145,7 @@ function bb2diaspora($Text, $fordiaspora = true) {
// Converting images with size parameters to simple images. Markdown doesn't know it.
$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text);
// Extracting multi-line code blocks before the whitespace processing/code highlighter in bbcode()
// Extracting multi-line code blocks before the whitespace processing/code highlighter in BBCode::convert()
$codeblocks = [];
$Text = preg_replace_callback("#\[code(?:=([^\]]*))?\](.*?)\[\/code\]#is",

4
mod/follow.php
View File

@ -164,9 +164,9 @@ function follow_content(App $a) {
'$url_label' => L10n::t("Profile URL"),
'$myaddr' => $myaddr,
'$request' => $request,
/*'$location' => bbcode($r[0]["location"]),
/*'$location' => Friendica\Content\Text\BBCode::::convert($r[0]["location"]),
'$location_label' => L10n::t("Location:"),
'$about' => bbcode($r[0]["about"], false, false),
'$about' => Friendica\Content\Text\BBCode::::convert($r[0]["about"], false, false),
'$about_label' => L10n::t("About:"), */
'$keywords' => $r[0]["keywords"],
'$keywords_label' => L10n::t("Tags:")