From 1b3196862d4e68e2556d0d9f4edb10a6deb70dfd Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 11 Sep 2014 02:19:21 -0700
Subject: issue #588 can't add feeds to collections using connedit page group
 sidebar widget

---
 include/group.php       | 1 +
 mod/contactgroup.php    | 2 +-
 version.inc             | 2 +-
 view/tpl/group_side.tpl | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/group.php b/include/group.php
index acb65df28..d4f08108f 100644
--- a/include/group.php
+++ b/include/group.php
@@ -280,6 +280,7 @@ function group_side($every="connections",$each="group",$edit = false, $group_id
 			
 			$groups[] = array(
 				'id'		=> $rr['id'],
+				'enc_cid'   => base64url_encode($cid),
 				'cid'		=> $cid,
 				'text' 		=> $rr['name'],
 				'selected' 	=> $selected,
diff --git a/mod/contactgroup.php b/mod/contactgroup.php
index 8b23f9f10..cac02a65d 100644
--- a/mod/contactgroup.php
+++ b/mod/contactgroup.php
@@ -10,7 +10,7 @@ function contactgroup_content(&$a) {
 
 	if((argc() > 2) && (intval(argv(1))) && (argv(2))) {
 		$r = q("SELECT abook_xchan from abook where abook_xchan = '%s' and abook_channel = %d and not ( abook_flags & %d ) limit 1",
-			dbesc(argv(2)),
+			dbesc(base64url_decode(argv(2))),
 			intval(local_user()),
 			intval(ABOOK_FLAG_SELF)
 		);
diff --git a/version.inc b/version.inc
index 2b982ae7e..7da7e4302 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-09-10.794
+2014-09-11.795
diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl
index 8c5d3927d..8680a3db0 100755
--- a/view/tpl/group_side.tpl
+++ b/view/tpl/group_side.tpl
@@ -9,7 +9,7 @@
 				{{if $group.cid}}
 					<input type="checkbox" 
 						class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" 
-						onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
+						onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}');return true;"
 						{{if $group.ismember}}checked="checked"{{/if}}
 					/>
 				{{/if}}			
-- 
cgit v1.2.3