include bb2diaspora at top level

diff --git a/include/diaspora.php b/include/diaspora.php
index b841c77703b78fc7f2478e58099c0f196f812807..345ea5562a532b5a67028dd777727ebe99eae50c 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -2,6 +2,7 @@
 
 require_once('include/crypto.php');
 require_once('include/items.php');
+require_once('include/bb2diaspora.php');
 
 function diaspora_get_contact_by_handle($uid,$handle) {
        $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `addr` = '%s' LIMIT 1",
@@ -845,7 +846,6 @@ function diaspora_send_status($item,$owner,$contact) {
        $a = get_app();
        $myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
        $theiraddr = $contact['addr'];
-       require_once('include/bb2diaspora.php');
 
        $body = xmlify(bb2diaspora($item['body']));
        $public = (($item['private']) ? 'false' : 'true');