harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issue #588 can't add feeds to collections using connedit page group sidebar widget

Browse Source
This commit is contained in:
friendica 2014-09-11 02:19:21 -07:00
parent 46fd0ef5ba
commit 1b3196862d
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/group.php
View File

@ -280,6 +280,7 @@ function group_side($every="connections",$each="group",$edit = false, $group_id
$groups[] = array( $groups[] = array(
'id' => $rr['id'], 'id' => $rr['id'],
'enc_cid' => base64url_encode($cid),
'cid' => $cid, 'cid' => $cid,
'text' => $rr['name'], 'text' => $rr['name'],
'selected' => $selected, 'selected' => $selected,

2
mod/contactgroup.php
View File

@ -10,7 +10,7 @@ function contactgroup_content(&$a) {
if((argc() > 2) && (intval(argv(1))) && (argv(2))) { 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", $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(local_user()),
intval(ABOOK_FLAG_SELF) intval(ABOOK_FLAG_SELF)
); );

2
version.inc
View File

@ -1 +1 @@
2014-09-10.794 2014-09-11.795

2
view/tpl/group_side.tpl
View File

@ -9,7 +9,7 @@
{{if $group.cid}} {{if $group.cid}}
<input type="checkbox" <input type="checkbox"
class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" 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 $group.ismember}}checked="checked"{{/if}}
/> />
{{/if}} {{/if}}