Merge remote-tracking branch 'upstream/develop' into 1602-diaspora

[friendica.git] / mod / salmon.php

diff --git a/mod/salmon.php b/mod/salmon.php
index ee3826d8a8bb37a3c3b734fea775dd12804afeab..9c22e42d110b3368a7bf6a950761cec238789530 100644 (file)
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -6,7 +6,6 @@ require_once('include/crypto.php');
 require_once('include/items.php');
 require_once('include/follow.php');
 
-if(! function_exists('salmon_return')) {
 function salmon_return($val) {
 
        if($val >= 400)
@@ -17,10 +16,9 @@ function salmon_return($val) {
        logger('mod-salmon returns ' . $val);
        header($_SERVER["SERVER_PROTOCOL"] . ' ' . $val . ' ' . $err);
        killme();
-}
+
 }
 
-if(! function_exists('salmon_post')) {
 function salmon_post(&$a) {
 
        $xml = file_get_contents('php://input');
@@ -157,7 +155,7 @@ function salmon_post(&$a) {
                if(get_pconfig($importer['uid'],'system','ostatus_autofriend')) {
                        $result = new_contact($importer['uid'],$author_link);
                        if($result['success']) {
-                               $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s')
+                               $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s') 
                                        AND `uid` = %d LIMIT 1",
                                        dbesc(NETWORK_OSTATUS),
                                        dbesc($author_link),
@@ -187,4 +185,3 @@ function salmon_post(&$a) {
 
        http_status_exit(200);
 }
-}