From: Michael Vogel Date: Mon, 5 Oct 2015 20:25:14 +0000 (+0200) Subject: Removed "proxy_parse_html" since it is now done in the bbcode function. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7ed61b2edc50b8ff51f48446afc2b9743296d107;p=friendica.git Removed "proxy_parse_html" since it is now done in the bbcode function. --- diff --git a/include/text.php b/include/text.php index 1d27963cc2..c5b28b508e 100644 --- a/include/text.php +++ b/include/text.php @@ -1410,9 +1410,6 @@ function prepare_body(&$item,$attach = false, $preview = false) { put_item_in_cache($item, true); $s = $item["rendered-html"]; - //require_once("mod/proxy.php"); - //$s = proxy_parse_html($s); - $prep_arr = array('item' => $item, 'html' => $s, 'preview' => $preview); call_hooks('prepare_body', $prep_arr); $s = $prep_arr['html']; diff --git a/mod/display.php b/mod/display.php index be5dd7cae3..f945f9fe60 100644 --- a/mod/display.php +++ b/mod/display.php @@ -115,8 +115,8 @@ function display_fetchauthor($a, $item) { if (count($r)) { $profiledata["photo"] = proxy_url($r[0]["photo"]); - $profiledata["address"] = proxy_parse_html(bbcode($r[0]["location"])); - $profiledata["about"] = proxy_parse_html(bbcode($r[0]["about"])); + $profiledata["address"] = bbcode($r[0]["location"]); + $profiledata["about"] = bbcode($r[0]["about"]); if ($r[0]["nick"] != "") $profiledata["nickname"] = $r[0]["nick"]; } @@ -127,9 +127,9 @@ function display_fetchauthor($a, $item) { if ($profiledata["photo"] == "") $profiledata["photo"] = proxy_url($r[0]["avatar"]); if ($profiledata["address"] == "") - $profiledata["address"] = proxy_parse_html(bbcode($r[0]["location"])); + $profiledata["address"] = bbcode($r[0]["location"]); if ($profiledata["about"] == "") - $profiledata["about"] = proxy_parse_html(bbcode($r[0]["about"])); + $profiledata["about"] = bbcode($r[0]["about"]); if (($profiledata["nickname"] == "") AND ($r[0]["nick"] != "")) $profiledata["nickname"] = $r[0]["nick"]; } @@ -193,8 +193,8 @@ function display_fetchauthor($a, $item) { $r = q("SELECT `avatar`, `nick`, `location`, `about` FROM `unique_contacts` WHERE `url` = '%s'", dbesc(normalise_link($profiledata["url"]))); if (count($r)) { $profiledata["photo"] = proxy_url($r[0]["avatar"]); - $profiledata["address"] = proxy_parse_html(bbcode($r[0]["location"])); - $profiledata["about"] = proxy_parse_html(bbcode($r[0]["about"])); + $profiledata["address"] = bbcode($r[0]["location"]); + $profiledata["about"] = bbcode($r[0]["about"]); if ($r[0]["nick"] != "") $profiledata["nickname"] = $r[0]["nick"]; } diff --git a/mod/follow.php b/mod/follow.php index 2c8452b1bf..25169e403a 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -100,7 +100,7 @@ function follow_content(&$a) { '$request' => $request, '$location' => bbcode($r[0]["location"]), '$location_label' => t("Location:"), - '$about' => proxy_parse_html(bbcode($r[0]["about"], false, false)), + '$about' => bbcode($r[0]["about"], false, false), '$about_label' => t("About:"), '$keywords' => $r[0]["keywords"], '$keywords_label' => t("Tags:") diff --git a/mod/notifications.php b/mod/notifications.php index 69ab592afe..95ebff96f3 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -235,7 +235,7 @@ function notifications_content(&$a) { '$fullname' => $rr['name'], '$location' => bbcode($rr['glocation'], false, false), '$location_label' => t('Location:'), - '$about' => proxy_parse_html(bbcode($rr['gabout'], false, false)), + '$about' => bbcode($rr['gabout'], false, false), '$about_label' => t('About:'), '$keywords' => $rr['gkeywords'], '$keywords_label' => t('Tags:'),