X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsalmon.php;h=e3f57da62a1e1937ce17ca6eff4793107bb8dafc;hb=6a8a36f12d00f35004fbb034972ca87dd1a3c4f5;hp=37230a557351ad70e9b4faada55a17a89f6ef69e;hpb=293436e5fd5110220c969513858dbb979f1f35d3;p=friendica.git

diff --git a/mod/salmon.php b/mod/salmon.php
index 37230a5573..e3f57da62a 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -31,7 +31,7 @@ function salmon_post(&$a) {
 	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
 		dbesc($nick)
 	);
-	if(! count($r))
+	if(! dbm::is_result($r))
 		http_status_exit(500);
 
 	$importer = $r[0];
@@ -150,7 +150,7 @@ function salmon_post(&$a) {
 		dbesc(normalise_link($author_link)),
 		intval($importer['uid'])
 	);
-	if(! count($r)) {
+	if(! dbm::is_result($r)) {
 		logger('mod-salmon: Author unknown to us.');
 		if(get_pconfig($importer['uid'],'system','ostatus_autofriend')) {
 			$result = new_contact($importer['uid'],$author_link);
@@ -169,8 +169,8 @@ function salmon_post(&$a) {
 	// Have we ignored the person?
 	// If so we can not accept this post.
 
-	//if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
-	if(count($r) && $r[0]['blocked']) {
+	//if((dbm::is_result($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
+	if(dbm::is_result($r) && $r[0]['blocked']) {
 		logger('mod-salmon: Ignoring this author.');
 		http_status_exit(202);
 		// NOTREACHED
@@ -179,7 +179,7 @@ function salmon_post(&$a) {
 	// Placeholder for hub discovery.
 	$hub = '';
 
-	$contact_rec = ((count($r)) ? $r[0] : null);
+	$contact_rec = ((dbm::is_result($r)) ? $r[0] : null);
 
 	ostatus::import($data,$importer,$contact_rec, $hub);