aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-08-15 01:32:09 -0700
committerfriendica <info@friendica.com>2013-08-15 01:32:09 -0700
commitc17f7124f31a6289db75eb71e3b723f286eb7d52 (patch)
treed3fea4db4cdf862a4d559d641389f72749201133
parentefb730cedcc82fadcb8474d44f8820d92b0187e6 (diff)
downloadvolse-hubzilla-c17f7124f31a6289db75eb71e3b723f286eb7d52.tar.gz
volse-hubzilla-c17f7124f31a6289db75eb71e3b723f286eb7d52.tar.bz2
volse-hubzilla-c17f7124f31a6289db75eb71e3b723f286eb7d52.zip
not able to drop pending connections
-rw-r--r--mod/connections.php3
-rw-r--r--version.inc2
2 files changed, 3 insertions, 2 deletions
diff --git a/mod/connections.php b/mod/connections.php
index 8f779bca5..7c4d8acc1 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -179,7 +179,8 @@ function connections_content(&$a) {
intval($contact_id),
intval(local_user()),
intval(ABOOK_FLAG_SELF),
- intval(ABOOK_FLAG_PENDING)
+ // allow drop even if pending, just duplicate the self query
+ intval(($cmd === 'drop') ? ABOOK_FLAG_SELF : ABOOK_FLAG_PENDING)
);
if(! count($orig_record)) {
diff --git a/version.inc b/version.inc
index f1ce0f558..e0ba0d8fd 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-08-14.405
+2013-08-15.406