Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links

# Conflicts:
#	include/follow.php

diff --cc include/Contact.php
Simple merge

diff --cc include/api.php
Simple merge

diff --cc include/contact_selectors.php
Simple merge

diff --cc include/delivery.php
Simple merge

diff --cc include/diaspora.php
index fcc93093953e621034fe4aa0af013147ad6b3144,3b4832e74f579bcdd35b4cba9f2ba1f4e22fec8a..4af1b6daa171ac637cae9cf9e0e02d2bb8ef7b59
--- 1/include/diaspora.php
--- 2/include/diaspora.php
+++ b/include/diaspora.php
@@@ -2359,12 -2286,11 +2359,12 @@@ class Diaspora 
  
                // Attach embedded pictures to the body
                if ($data->photo) {
 -                      foreach ($data->photo AS $photo)
 +                      foreach ($data->photo AS $photo) {
                                $body = "[img]".unxmlify($photo->remote_photo_path).
                                        unxmlify($photo->remote_photo_name)."[/img]\n".$body;
 +                      }
  
-                       $datarray["object-type"] = ACTIVITY_OBJ_PHOTO;
+                       $datarray["object-type"] = ACTIVITY_OBJ_IMAGE;
                } else {
                        $datarray["object-type"] = ACTIVITY_OBJ_NOTE;
  

diff --cc include/follow.php
index 2cb72a60681b1a7d06973fe68dc12a66e433f32e,7a3514b3a73aa4942ca00f009cc6128361782461..779ecf082dea4f1c765117cbb4acde80fce3b068
--- 1/include/follow.php
--- 2/include/follow.php
+++ b/include/follow.php
@@@ -295,14 -279,18 +279,24 @@@ function new_contact($uid,$url,$interac
                        intval($uid)
        );
  
-       if(count($r)) {
-               if(($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
-                       require_once('include/salmon.php');
-                       slapper($r[0],$contact['notify'],$slap);
+       if (dbm::is_result($r)) {
+               if (($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
+ 
+                       // create a follow slap
+                       $item = array();
+                       $item['verb'] = ACTIVITY_FOLLOW;
+                       $item['follow'] = $contact["url"];
+                       $slap = ostatus::salmon($item, $r[0]);
+                       slapper($r[0], $contact['notify'], $slap);
                }
++<<<<<<< HEAD
 +              if($contact['network'] == NETWORK_DIASPORA) {
 +                      require_once('include/diaspora.php');
 +                      $ret = Diaspora::send_share($a->user,$contact);
++=======
+               if ($contact['network'] == NETWORK_DIASPORA) {
+                       $ret = diaspora::send_share($a->user,$contact);
++>>>>>>> friendica/develop
                        logger('share returns: '.$ret);
                }
        }

diff --cc include/like.php
Simple merge

diff --cc include/notifier.php
Simple merge

diff --cc mod/dfrn_confirm.php
Simple merge

diff --cc mod/fetch.php
Simple merge

diff --cc mod/item.php
Simple merge

diff --cc mod/p.php
Simple merge

diff --cc mod/receive.php
Simple merge

diff --cc object/Item.php
Simple merge