bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert "Updated modules to allow for partial overrides without errors"

Browse source 
This reverts commit db949bb802.
This commit is contained in:
fabrixxm 2016-02-07 15:11:34 +01:00
commit b202e02fbf
123 changed files with 471 additions and 768 deletions
Download patch file Download diff file Expand all files Collapse all files

7
mod/salmon.php
View file

@ -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);
}
}