diff options
| author | friendica <info@friendica.com> | 2013-12-19 19:16:46 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-12-19 19:16:46 -0800 |
| commit | bccc20f38c3919d453b0dee1ed354aa4eb13b398 (patch) | |
| tree | 0e9fa8e0de4e4e6807223ac176a55ad8e3bce77e /mod | |
| parent | 648a7a5735148479fc8d97bfaa1f3d3cca249276 (diff) | |
| download | volse-hubzilla-bccc20f38c3919d453b0dee1ed354aa4eb13b398.tar.gz volse-hubzilla-bccc20f38c3919d453b0dee1ed354aa4eb13b398.tar.bz2 volse-hubzilla-bccc20f38c3919d453b0dee1ed354aa4eb13b398.zip | |
default photo issue, and connections page showing deleted accounts. Also show last updated on connedit page
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/connections.php | 8 | ||||
| -rw-r--r-- | mod/connedit.php | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mod/connections.php b/mod/connections.php index 0365a0585..2119c69c7 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -300,9 +300,10 @@ function connections_content(&$a) { $r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash - where abook_channel = %d and not (abook_flags & %d) $sql_extra $sql_extra2 ", + where abook_channel = %d and not (abook_flags & %d) and not (xchan_flags & %d ) $sql_extra $sql_extra2 ", intval(local_user()), - intval(ABOOK_FLAG_SELF) + intval(ABOOK_FLAG_SELF), + intval(XCHAN_FLAGS_DELETED) ); if(count($r)) { $a->set_pager_total($r[0]['total']); @@ -310,9 +311,10 @@ function connections_content(&$a) { } $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) $sql_extra $sql_extra2 ORDER BY xchan_name LIMIT %d , %d ", + WHERE abook_channel = %d and not (abook_flags & %d) and not ( xchan_flags & %d) $sql_extra $sql_extra2 ORDER BY xchan_name LIMIT %d , %d ", intval(local_user()), intval(ABOOK_FLAG_SELF), + intval(XCHAN_FLAGS_DELETED), intval($a->pager['start']), intval($a->pager['itemspage']) ); diff --git a/mod/connedit.php b/mod/connedit.php index 6d34ad997..c6c8845c8 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -482,7 +482,7 @@ function connedit_content(&$a) { '$lastupdtext' => t('Last update:'), '$lost_contact' => $lost_contact, '$updpub' => t('Update public posts'), - '$last_update' => $last_update, + '$last_update' => relative_date($contact['abook_connected']), '$udnow' => t('Update now'), '$profile_select' => contact_profile_assign($contact['abook_profile']), '$multiprofs' => feature_enabled(local_user(),'multi_profiles'), |