Merge pull request #2859 from rabuzarus/0510-update_fullcalendar

[friendica.git] / include / salmon.php

diff --git a/include/salmon.php b/include/salmon.php
index 988c542e2d4136558503ab6ff0165c2324607100..5e9c4fa616dc1df20eec3c8d16ac372add35155e 100644 (file)
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -1,15 +1,14 @@
 <?php
 
 require_once('include/crypto.php');
-
-
+require_once('include/Probe.php');
 
 function get_salmon_key($uri,$keyhash) {
        $ret = array();
 
        logger('Fetching salmon key for '.$uri);
 
-       $arr = lrdd($uri);
+       $arr = Probe::lrdd($uri);
 
        if(is_array($arr)) {
                foreach($arr as $a) {
@@ -32,8 +31,7 @@ function get_salmon_key($uri,$keyhash) {
                                        $ret[$x] = substr($ret[$x],strpos($ret[$x],',')+1);
                                else
                                        $ret[$x] = substr($ret[$x],5);
-                       }
-                       else
+                       } elseif (normalise_link($ret[$x]) == 'http://')
                                $ret[$x] = fetch_url($ret[$x]);
                }
        }