diff options
| author | friendica <info@friendica.com> | 2013-08-27 22:30:06 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-08-27 22:30:06 -0700 |
| commit | e8cd3b70407b4c33d82d21cc3a470b2a58852e4f (patch) | |
| tree | 5ce81f1f38aa2a6d7d2ddf69e6a8cef68e0b7728 /mod | |
| parent | e8a0005d29244e4897ca7806f24424a8f63d1dd8 (diff) | |
| download | volse-hubzilla-e8cd3b70407b4c33d82d21cc3a470b2a58852e4f.tar.gz volse-hubzilla-e8cd3b70407b4c33d82d21cc3a470b2a58852e4f.tar.bz2 volse-hubzilla-e8cd3b70407b4c33d82d21cc3a470b2a58852e4f.zip | |
bring back mail list and cleanup some issues which popped out with full PHP warnings
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/acl.php | 4 | ||||
| -rw-r--r-- | mod/network.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mod/acl.php b/mod/acl.php index 1b7a1ea8b..b886b7e58 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -51,7 +51,7 @@ function acl_init(&$a){ $r = q("SELECT COUNT(abook_id) AS c FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND not ( abook_flags & %d ) $sql_extra2" , intval(local_user()), - intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVE) + intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED) ); $contact_count = (int)$r[0]['c']; } @@ -127,7 +127,7 @@ function acl_init(&$a){ FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND not ( abook_flags & %d ) $sql_extra2 order by xchan_name asc" , intval(local_user()), - intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVE) + intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED) ); } elseif($type == 'm') { diff --git a/mod/network.php b/mod/network.php index e44a604de..39e6fe215 100644 --- a/mod/network.php +++ b/mod/network.php @@ -386,7 +386,7 @@ function network_content(&$a, $update = 0, $load = false) { nav_set_selected('network'); - $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); + $celeb = false; $x = array( 'is_owner' => true, |