tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Stopped using deprecated constants NETWORK_* (#5537)

Browse source 
* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...

* Removed deprecated NETWORK_* constants as per code reviewer's request.
This commit is contained in:
Roland Häder 2018-08-11 22:40:44 +02:00 • committed by Hypolite Petovan
commit e06fc2aa69
59 changed files with 527 additions and 492 deletions
Download patch file Download diff file Expand all files Collapse all files

7
mod/salmon.php
View file

@ -4,6 +4,7 @@
*/
use Friendica\App;
use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
@ -145,8 +146,8 @@ function salmon_post(App $a, $xml = '') {
$r = q("SELECT * FROM `contact` WHERE `network` IN ('%s', '%s')
AND (`nurl` = '%s' OR `alias` = '%s' OR `alias` = '%s')
AND `uid` = %d LIMIT 1",
DBA::escape(NETWORK_OSTATUS),
DBA::escape(NETWORK_DFRN),
DBA::escape(Protocol::OSTATUS),
DBA::escape(Protocol::DFRN),
DBA::escape(normalise_link($author_link)),
DBA::escape($author_link),
DBA::escape(normalise_link($author_link)),
@ -159,7 +160,7 @@ function salmon_post(App $a, $xml = '') {
if($result['success']) {
$r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s')
AND `uid` = %d LIMIT 1",
DBA::escape(NETWORK_OSTATUS),
DBA::escape(Protocol::OSTATUS),
DBA::escape($author_link),
DBA::escape($author_link),
intval($importer['uid'])