Merge remote-tracking branch 'remotes/friendica/master' into moveme

diff --cc boot.php
index 71304e53e2e84ddaa97a7822dcc445f63f2e57b7,2628c0f3f113fb46de4aa7625f2c82331a56a902..cd309d86552548e4bbd9b314e1ea38b35af9dfcc
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -1505,20 -1501,14 +1505,20 @@@ if(! function_exists('proc_run')) 
  
                if(count($args) && $args[0] === 'php')
                        $args[0] = ((x($a->config,'php_path')) && (strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 -              for($x = 0; $x < count($args); $x ++)
 +        
 +        // add baseurl to args. cli scripts can't construct it
 +        $args[] = $a->get_baseurl();
 +        
 +        for($x = 0; $x < count($args); $x ++)
                        $args[$x] = escapeshellarg($args[$x]);
  
 +        
 +
                $cmdline = implode($args," ");
                if(get_config('system','proc_windows'))
-                       proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo));
+                       proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo,dirname(__FILE__)));
                else
-                       proc_close(proc_open($cmdline." &",array(),$foo));
+                       proc_close(proc_open($cmdline." &",array(),$foo,dirname(__FILE__)));
        }
  }
  

diff --cc include/delivery.php
Simple merge

diff --cc include/items.php
Simple merge

diff --cc include/notifier.php
index c78d2f1a763473584ff720b23977a9fcf2390996,a999c3297b4c55cc3096f723c55b5302a9d2d23a..c58a8a854f60420b501606c8e426e60acbba2c82
--- 1/include/notifier.php
--- 2/include/notifier.php
+++ b/include/notifier.php
@@@ -134,13 -134,22 +134,26 @@@ function notifier_run(&$argv, &$argc)
                $recipients[] = $suggest[0]['cid'];
                $item = $suggest[0];
        }
+       elseif($cmd === 'removeme') {
+               $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($item_id));
+               $user = $r[0];
+               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", intval($item_id));
+               $self = $r[0];
+               $r = q("SELECT * FROM `contact` WHERE `self` = 0 AND `uid` = %d", intval($item_id));
+               if(! count($r))
+                       return;
+               require_once('include/Contact.php');
+               foreach($r as $contact) {
+                       terminate_friendship($user, $self, $contact);
+               }
+               return;
+       }
 +    elseif($cmd === 'relocate') {
 +        $normal_mode = false;
 +              $relocate = true;
 +        $uid = $item_id;
 +    }
        else {
--
                // find ancestors
                $r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1",
                        intval($item_id)

diff --cc include/onepoll.php
Simple merge

diff --cc include/poller.php
Simple merge

diff --cc mod/dfrn_notify.php
Simple merge