Merge https://github.com/redmatrix/redmatrix into pending_merge

Conflicts: include/zot.php
2015-09-19 22:48:22 -07:00 · 2015-09-19 22:48:22 -07:00 · ce064188c6
commit ce064188c6
parent 5d6f59a598 f4a4cf1402
2 changed files with 2 additions and 1 deletions
--- 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'])
--- a/version.inc
+++ b/version.inc
@ -1 +1 @@
-2015-09-18.1159
+2015-09-19.1160