Removed "proxy_parse_html" since it is now done in the bbcode function.

diff --git a/include/text.php b/include/text.php
index 1d27963cc2e3751f11be6b6bddb9e0517ad8037a..c5b28b508eb8111d923cb9666f164d6b254113f4 100644 (file)
--- 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 be5dd7cae38a2e56ac7a2db29812f6669cdb61f1..f945f9fe60d0090529b3b63ad2643094d46a6c07 100644 (file)
--- 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 2c8452b1bffa45211b58b1c348ee518ec0ad926b..25169e403aa33fc00dcf95a9878ff06c568587d0 100644 (file)
--- 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 69ab592afe276d8640c47f936857f1ffbcb9dba8..95ebff96f3669564055688c05840bb2901d3d9b5 100644 (file)
--- 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:'),