make contact_remove sort of work so I can actually get rid of Oliver's and Michael J's dead contacts and not poll them every ten minutes forever

3 files changed, 5 insertions, 5 deletions

diff --git a/mod/connections.php b/mod/connections.php
index 94982631a..90e74999e 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -223,7 +223,7 @@ function connections_content(&$a) {
 // FIXME
 //			terminate_friendship($a->get_channel(),$orig_record[0]);
 
-			contact_remove($orig_record[0]['abook_id']);
+			contact_remove(local_user(), $orig_record[0]['abook_id']);
 			info( t('Contact has been removed.') . EOL );
 			if(x($_SESSION,'return_url'))
 				goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
diff --git a/mod/dirsearch.php b/mod/dirsearch.php
index 1dbe60499..7e4323da9 100644
--- a/mod/dirsearch.php
+++ b/mod/dirsearch.php
@@ -71,7 +71,7 @@ function dirsearch_content(&$a) {
 	// By default we return one page (default 80 items maximum) and do not count total entries
 
 	$logic = ((strlen($sql_extra)) ? 0 : 1);
-dbg(1);
+
 	if($limit) 
 		$qlimit = " LIMIT $limit ";
 	else {
@@ -91,7 +91,7 @@ dbg(1);
 	$r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra and not ( xchan_flags & %d ) $order $qlimit ",
 		intval(XCHAN_FLAGS_HIDDEN)
 	);
-dbg(0);
+
 	$ret['page'] = $page + 1;
 	$ret['records'] = count($r);		
 
diff --git a/mod/network.php b/mod/network.php
index 143b7c5d1..91b4228c9 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -620,7 +620,7 @@ function network_content(&$a, $update = 0, $load = false) {
 		if($load) {
 
 			// Fetch a page full of parent items for this page
-dbg(1);
+
 			$r = q("SELECT item.id AS item_id FROM item 
 				left join abook on item.author_xchan = abook.abook_xchan
 				WHERE item.uid = %d AND item.item_restrict = 0
@@ -631,7 +631,7 @@ dbg(1);
 				intval(local_user()),
 				intval(ABOOK_FLAG_BLOCKED)
 			);
-dbg(0);
+
 		}
 		else {
 			// update