remove an erroneously pasted line

[friendica.git] / mod / dfrn_notify.php

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 6c3ae022b2f00dfe7bebebacfac76e77a502bb62..f904b06bc5e742740fa2df84782ca520e141c22e 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -75,6 +75,19 @@ function dfrn_notify_post(&$a) {
        logger('dfrn_notify: received notify from ' . $importer['name'] . ' for ' . $importer['username']);
        logger('dfrn_notify: data: ' . $data, LOGGER_DATA);
 
+       if($dissolve == 1) {
+
+               /**
+                * Relationship is dissolved permanently
+                */
+
+               require_once('include/Contact.php'); 
+               contact_remove($importer['id']);
+               logger('relationship dissolved : ' . $importer['name'] . ' dissolved ' . $importer['username']);
+               xml_status(0);
+
+       }
+
        if(strlen($key)) {
                $rawkey = hex2bin(trim($key));
                logger('rino: md5 raw key: ' . md5($rawkey));
@@ -94,17 +107,6 @@ function dfrn_notify_post(&$a) {
 
 
 
-       if($dissolve == 1) {
-
-               /**
-                * Relationship is dissolved permanently
-                */
- 
-               contact_remove($importer['id']);
-               logger('relationship dissolved : ' . $importer['name'] . ' dissolved ' . $importer['username']);
-               xml_status(0);
-
-       }
 
        if($importer['readonly']) {
                // We aren't receiving stuff from this person. But we will quietly ignore them
@@ -302,9 +304,9 @@ function dfrn_notify_post(&$a) {
 
                                        $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 
-                                       proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"comment-import\" \"$posted_id\" &", 
-                                               array(),$foo));
-
+                                       //proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"comment-import\" \"$posted_id\" &", array(),$foo));
+                                       proc_run($php_path,"include/notifier.php","comment-import","$posted_id");
+                                       
                                        if((! $is_like) && ($importer['notify-flags'] & NOTIFY_COMMENT) && (! $importer['self'])) {
                                                require_once('bbcode.php');
                                                $from = stripslashes($datarray['author-name']);