send diaspora share notification back to originator for auto friending

diff --git a/INSTALL.txt b/INSTALL.txt
index 053c339028c9f5bda2e55639003d8c6d449cd4ee..70027dc4c69ef7bad66d69b56f1d8a1974269c97 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -38,7 +38,7 @@ with the Diaspora network and improved security.
                - PHP *command line* access with register_argc_argv set to true in the 
 php.ini file [or see 'poormancron' in section 8]
 
-               - curl, gd, mysql, mbstring, mcrypt, and openssl extensions
+               - curl, gd (with at least jpeg support), mysql, mbstring, mcrypt, and openssl extensions
 
                - some form of email server or email gateway such that PHP mail() works
 

diff --git a/boot.php b/boot.php
index b06c2d0bf411d6f2dd6f6763138d52b12c991052..1f2b47b2e0ea4a65c0aa8a934c1c7ff1df0e5b0e 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1216' );
+define ( 'FRIENDICA_VERSION',      '2.3.1217' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1115      );
 

diff --git a/include/diaspora.php b/include/diaspora.php
index f32113668fa637fbc8d268b4818c51a6eb745723..5a19400daac04b494a2e8964954449617e9206db 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -610,6 +610,10 @@ function diaspora_request($importer,$xml) {
                        dbesc(datetime_convert()),
                        intval($contact_record['id'])
                );
+
+               $u = q("select * from user where id = %d limit 1",intval($importer['uid']));
+               if($u)
+                       $ret = diaspora_share($u[0],$contact_record);
        }
 
        return;
@@ -1781,27 +1785,6 @@ function diaspora_profile($importer,$xml) {
 
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 function diaspora_share($me,$contact) {
        $a = get_app();
        $myaddr = $me['nickname'] . '@' .  substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);