tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #1507 from annando/1504-community-automention

Browse source 
Automention of communities when a single contact is selected
This commit is contained in:
Tobias Diekershoff 2015-04-10 09:50:08 +02:00
parent e955f013ca 489af0d55d
commit 5e3f2b67a8
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
mod/network.php
View file

@ -452,11 +452,6 @@ function network_content(&$a, $update = 0) {
} }
set_pconfig(local_user(), 'network.view', 'net.selected', ($nets ? $nets : 'all')); set_pconfig(local_user(), 'network.view', 'net.selected', ($nets ? $nets : 'all'));
/*if ($update) {
print_r($_GET);
die("ss");
}*/
if(! $update) { if(! $update) {
if($group) { if($group) {
if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) { if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
@ -471,6 +466,14 @@ die("ss");
$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
$content = "";
if ($cid) {
$contact = q("SELECT `nick` FROM `contact` WHERE `id` = %d AND `uid` = %d AND `forum`", intval($cid), intval(local_user()));
if ($contact)
$content = "@".$contact[0]["nick"]."+".$cid;
}
$x = array( $x = array(
'is_owner' => true, 'is_owner' => true,
'allow_location' => $a->user['allow_location'], 'allow_location' => $a->user['allow_location'],
@ -483,6 +486,7 @@ die("ss");
'visitor' => 'block', 'visitor' => 'block',
'profile_uid' => local_user(), 'profile_uid' => local_user(),
'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector 'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
'content' => $content,
); );
$o .= status_editor($a,$x); $o .= status_editor($a,$x);