Merge branch 'swat0' into 0.9.x

2010-09-02 16:58:55 -04:00
parent 7517409bf1 ebcd8644a5
commit 82b1d6daef
6 changed files with 105 additions and 18 deletions
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -984,4 +984,18 @@ class OStatusPlugin extends Plugin
        $feed = $oprofile->feeduri;
        return false;
    }
+
+    function onStartGetProfileFromURI($uri, &$profile) {
+
+        // XXX: do discovery here instead (OStatus_profile::ensureProfileURI($uri))
+
+        $oprofile = Ostatus_profile::staticGet('uri', $uri);
+
+        if (!empty($oprofile) && !$oprofile->isGroup()) {
+            $profile = $oprofile->localProfile();
+            return false;
+        }
+
+        return true;
+    }
 }