aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-19 22:48:22 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-19 22:48:22 -0700
commitce064188c6d26b7c3b331d1d163988af70e3f2b9 (patch)
tree19bc8e19b885371b12f82adab8b66ea547761488
parent5d6f59a598fdf700b90d7d14bb5c9087c0968cb9 (diff)
parentf4a4cf140268db48fa5fb49d10e7149b3fb7c4cf (diff)
downloadvolse-hubzilla-ce064188c6d26b7c3b331d1d163988af70e3f2b9.tar.gz
volse-hubzilla-ce064188c6d26b7c3b331d1d163988af70e3f2b9.tar.bz2
volse-hubzilla-ce064188c6d26b7c3b331d1d163988af70e3f2b9.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: include/zot.php
-rw-r--r--include/zot.php1
-rw-r--r--version.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php
index 52ae23ba5..f6816ee7c 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -489,6 +489,7 @@ function zot_refresh($them, $channel = null, $force = false) {
$new_perms = get_all_perms($channel['channel_id'],$x['hash']);
// Send a clone sync packet and a permissions update if permissions have changed
+
$new_connection = q("select * from abook where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 order by abook_created desc limit 1",
dbesc($x['hash']),
intval($channel['channel_id'])
diff --git a/version.inc b/version.inc
index 2d7153d51..4a93ab93e 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-09-18.1159
+2015-09-19.1160