aboutsummaryrefslogtreecommitdiffstats
path: root/include/connections.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-08-22 20:31:31 -0700
committerredmatrix <git@macgirvin.com>2016-08-22 20:31:31 -0700
commit0b16a5531a757c74da5a12ba4678011ed6c6d221 (patch)
tree155f65228377a0f371f233bd1918d25f1b5a1d62 /include/connections.php
parentb7fbd0ee50428402c1d692e74d978cac236f6ae2 (diff)
downloadvolse-hubzilla-0b16a5531a757c74da5a12ba4678011ed6c6d221.tar.gz
volse-hubzilla-0b16a5531a757c74da5a12ba4678011ed6c6d221.tar.bz2
volse-hubzilla-0b16a5531a757c74da5a12ba4678011ed6c6d221.zip
Revert "Merge branch '1.12RC'"
This reverts commit b89c869e7ce2586852607a55717f5388c88e275d, reversing changes made to fbb357ac47f0c5823dd30aa9b955982035cef8ba.
Diffstat (limited to 'include/connections.php')
-rw-r--r--include/connections.php6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/connections.php b/include/connections.php
index e60b4fcae..ed4526a09 100644
--- a/include/connections.php
+++ b/include/connections.php
@@ -566,7 +566,6 @@ function contact_remove($channel_id, $abook_id) {
drop_item($rr['id'],false);
}
}
-
q("delete from abook where abook_id = %d and abook_channel = %d",
intval($abook['abook_id']),
@@ -589,11 +588,6 @@ function contact_remove($channel_id, $abook_id) {
intval($channel_id)
);
- $r = q("delete from abconfig where chan = %d and xchan = '%s'",
- intval($channel_id),
- dbesc($abook['abook_xchan'])
- );
-
return true;
}