X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fnoscrape.php;h=e1d51e5a801eae0f8a5bcee7c27d0cc9d43e2c1e;hb=97c120d8f22a6fa3dc2e20c3a9666d3050200c80;hp=0964e85ca1e4a26e1d6ef62ca39ba09e83575a2c;hpb=9d63c3eb013163c3643a53187e1acdbfa8064d4c;p=friendica.git

diff --git a/mod/noscrape.php b/mod/noscrape.php
index 0964e85ca1..e1d51e5a80 100644
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -36,6 +36,11 @@ function noscrape_init(App $a)
 		'account-type' => $a->profile['account-type'],
 	];
 
+	$dfrn_pages = ['request', 'confirm', 'notify', 'poll'];
+	foreach ($dfrn_pages as $dfrn) {
+		$json_info["dfrn-{$dfrn}"] = System::baseUrl()."/dfrn_{$dfrn}/{$which}";
+	}
+
 	if (!$a->profile['net-publish'] || $a->profile['hidewall']) {
 		header('Content-type: application/json; charset=utf-8');
 		$json_info["hide"] = true;
@@ -43,7 +48,7 @@ function noscrape_init(App $a)
 		exit;
 	}
 
-	$keywords = ((x($a->profile, 'pub_keywords')) ? $a->profile['pub_keywords'] : '');
+	$keywords = defaults($a->profile, 'pub_keywords', '');
 	$keywords = str_replace(['#',',',' ',',,'], ['',' ',',',','], $keywords);
 	$keywords = explode(',', $keywords);
 
@@ -99,11 +104,6 @@ function noscrape_init(App $a)
 		}
 	}
 
-	$dfrn_pages = ['request', 'confirm', 'notify', 'poll'];
-	foreach ($dfrn_pages as $dfrn) {
-		$json_info["dfrn-{$dfrn}"] = System::baseUrl()."/dfrn_{$dfrn}/{$which}";
-	}
-
 	//Output all the JSON!
 	header('Content-type: application/json; charset=utf-8');
 	echo json_encode($json_info);