Refactor comments including "bbcode()"

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 4f7cce8f5f9e100265ea49566f0a807262b0c6a3..0a869ab383c5b05abc34f645475b83a5694148f2 100644 (file)
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -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",

diff --git a/mod/follow.php b/mod/follow.php
index 83263f4031e5d1181e810c2462024853affe1002..bb9bc0eb3b3ca80aefabcd2b58b3578146c1aa96 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -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:")