diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-03-02 12:31:46 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-03-02 12:31:46 +0100 |
| commit | 22729da2a2a3ef71b4c5f00f15e254bddecedd91 (patch) | |
| tree | fe6ae53abea2ed9dffb1c49f9e8683691c24004d /include | |
| parent | c97cc1487cbcac2c4fbc4d9e931a82df109af2e6 (diff) | |
| parent | 428b4dbad63d429c3b0d47b49ff5918dbda3c596 (diff) | |
| download | volse-hubzilla-22729da2a2a3ef71b4c5f00f15e254bddecedd91.tar.gz volse-hubzilla-22729da2a2a3ef71b4c5f00f15e254bddecedd91.tar.bz2 volse-hubzilla-22729da2a2a3ef71b4c5f00f15e254bddecedd91.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla
Diffstat (limited to 'include')
| -rw-r--r-- | include/identity.php | 19 | ||||
| -rw-r--r-- | include/widgets.php | 2 |
2 files changed, 20 insertions, 1 deletions
diff --git a/include/identity.php b/include/identity.php index 380556246..382b096fe 100644 --- a/include/identity.php +++ b/include/identity.php @@ -1253,6 +1253,24 @@ function advanced_profile(&$a) { if($a->profile['name']) { + $profile_fields_basic = get_profile_fields_basic(); + $profile_fields_advanced = get_profile_fields_advanced(); + + $advanced = ((feature_enabled($a->profile['profile_uid'],'advanced_profiles')) ? true : false); + if($advanced) + $fields = $profile_fields_advanced; + else + $fields = $profile_fields_basic; + + $clean_fields = array(); + if($fields) { + foreach($fields as $k => $v) { + $clean_fields[] = trim($k); + } + } + + + $tpl = get_markup_template('profile_advanced.tpl'); $profile = array(); @@ -1370,6 +1388,7 @@ function advanced_profile(&$a) { '$canlike' => (($profile['canlike'])? true : false), '$likethis' => t('Like this thing'), '$profile' => $profile, + '$fields' => $clean_fields, '$editmenu' => profile_edit_menu($a->profile['profile_uid']), '$things' => $things )); diff --git a/include/widgets.php b/include/widgets.php index 05b9eca1a..3b8a5a7a3 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -1197,7 +1197,7 @@ function widget_forums($arr) { $perms_sql = item_permissions_sql(local_channel()) . item_normal(); - $r1 = q("select * from abook left join xchan on abook_xchan = xchan_hash where ( xchan_pubforum = 1 or ((abook_their_perms & %d ) != 0 and (abook_their_perms & %d ) = 0) ) and abook_channel = %d order by xchan_name $limit ", + $r1 = q("select * from abook left join xchan on abook_xchan = xchan_hash where ( xchan_pubforum = 1 or ((abook_their_perms & %d ) != 0 and (abook_their_perms & %d ) = 0) ) and xchan_deleted = 0 and abook_channel = %d order by xchan_name $limit ", intval(PERMS_W_TAGWALL), intval(PERMS_W_STREAM), intval(local_channel()) |