partial fix for D* public key format change

diff --git a/include/Scrape.php b/include/Scrape.php
index b784650cd168722cb462d4031e1a9fb888b9e7a8..85c636788910e94f3f3295a3f7b32e939b04acf3 100644 (file)
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -394,7 +394,10 @@ function probe_url($url, $mode = PROBE_NORMAL) {
                                }
                                if($link['@attributes']['rel'] === 'diaspora-public-key') {
                                        $diaspora_key = base64_decode(unamp($link['@attributes']['href']));
-                                       $pubkey = rsatopem($diaspora_key);
+                                       if(strstr($diaspora_key,'RSA '))
+                                               $pubkey = rsatopem($diaspora_key);
+                                       else
+                                               $pubkey = $diaspora_key;
                                        $diaspora = true;
                                }
                        }