diff options
| author | friendica <info@friendica.com> | 2014-07-16 22:32:18 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-07-16 22:32:18 -0700 |
| commit | de97073e135d1efec8a7792cbe6a0ac09b227e99 (patch) | |
| tree | f1ad90756ed9b0a00197583014eee2a8ad2015a6 | |
| parent | 98e85917bb0c12765f5ca42c49c0e64a348952ea (diff) | |
| download | volse-hubzilla-de97073e135d1efec8a7792cbe6a0ac09b227e99.tar.gz volse-hubzilla-de97073e135d1efec8a7792cbe6a0ac09b227e99.tar.bz2 volse-hubzilla-de97073e135d1efec8a7792cbe6a0ac09b227e99.zip | |
don't subdue archived connections in viewconnections
| -rwxr-xr-x | include/text.php | 5 | ||||
| -rw-r--r-- | mod/viewconnections.php | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/text.php b/include/text.php index ee0127732..1c5a78d4e 100755 --- a/include/text.php +++ b/include/text.php @@ -712,7 +712,7 @@ function contact_block() { $abook_flags = ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF; $xchan_flags = XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED; if(! $is_owner) { - $abook_flags = $abook_flags | ABOOK_FLAGS_HIDDEN; + $abook_flags = $abook_flags | ABOOK_FLAG_HIDDEN; $xchan_flags = $xchan_flags | XCHAN_FLAGS_HIDDEN; } @@ -734,7 +734,7 @@ function contact_block() { $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash WHERE abook_channel = %d AND not ( abook_flags & %d) and not (xchan_flags & %d ) ORDER BY RAND() LIMIT %d", intval($a->profile['uid']), - intval($abook_flags|ABOOK_FLAGS_ARCHIVED), + intval($abook_flags|ABOOK_FLAG_ARCHIVED), intval($xchan_flags), intval($shown) ); @@ -743,6 +743,7 @@ function contact_block() { $contacts = sprintf( tt('%d Connection','%d Connections', $total),$total); $micropro = Array(); foreach($r as $rr) { + $rr['archived'] = (($rr['abook_flags'] & ABOOK_FLAG_ARCHIVED) ? true : false); $micropro[] = micropro($rr,true,'mpfriend'); } } diff --git a/mod/viewconnections.php b/mod/viewconnections.php index b6a6b483c..40ce28efe 100644 --- a/mod/viewconnections.php +++ b/mod/viewconnections.php @@ -33,7 +33,7 @@ function viewconnections_content(&$a) { $abook_flags = ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF; $xchan_flags = XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED; if(! $is_owner) { - $abook_flags = $abook_flags | ABOOK_FLAGS_HIDDEN; + $abook_flags = $abook_flags | ABOOK_FLAG_HIDDEN; $xchan_flags = $xchan_flags | XCHAN_FLAGS_HIDDEN; } @@ -67,6 +67,7 @@ function viewconnections_content(&$a) { if($url) { $contacts[] = array( 'id' => $rr['abook_id'], + 'archived' => (($rr['abook_flags'] & ABOOK_FLAG_ARCHIVED) ? true : false), 'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $rr['xchan_name'], $rr['xchan_url']), 'thumb' => $rr['xchan_photo_m'], 'name' => substr($rr['xchan_name'],0,20), |