remove unneeded function page_type_translate()

[friendica.git] / include / Scrape.php

diff --git a/include/Scrape.php b/include/Scrape.php
index ae9331ff7af8fc389ea67aa2e24837e84f8d2e58..4f9d675c1801309f5d11fee3a6bd2a79b28ea21e 100644 (file)
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -4,7 +4,7 @@ require_once('library/HTML5/Parser.php');
 require_once('include/crypto.php');
 
 if(! function_exists('scrape_dfrn')) {
-function scrape_dfrn($url) {
+function scrape_dfrn($url, $dont_probe = false) {
 
        $a = get_app();
 
@@ -17,6 +17,13 @@ function scrape_dfrn($url) {
        if(! $s)
                return $ret;
 
+       if (!$dont_probe) {
+               $probe = probe_url($url);
+
+               if (isset($probe["addr"]))
+                       $ret["addr"] = $probe["addr"];
+       }
+
        $headers = $a->get_curl_headers();
        logger('scrape_dfrn: headers=' . $headers, LOGGER_DEBUG);
 
@@ -524,7 +531,7 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
 
 
                if(strlen($dfrn)) {
-                       $ret = scrape_dfrn(($hcard) ? $hcard : $dfrn);
+                       $ret = scrape_dfrn(($hcard) ? $hcard : $dfrn, true);
                        if(is_array($ret) && x($ret,'dfrn-request')) {
                                $network = NETWORK_DFRN;
                                $request = $ret['dfrn-request'];