diff options
| author | tony baldwin <tony@tonybaldwin.org> | 2014-04-12 08:37:56 -0400 |
|---|---|---|
| committer | tony baldwin <tony@tonybaldwin.org> | 2014-04-12 08:37:56 -0400 |
| commit | ebd33b185da1c36e718dfa4a2971c3db35cbda22 (patch) | |
| tree | c23cbf55aac433c90ac254d0684dabf9d4528133 /mod/webpages.php | |
| parent | 5cca00ddc79dad667464674e08a2a860e262eabd (diff) | |
| parent | d0834c7e1394e1986b2b00e039125deff74d9e5e (diff) | |
| download | volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.tar.gz volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.tar.bz2 volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/css/style.css
whatever
Diffstat (limited to 'mod/webpages.php')
| -rw-r--r-- | mod/webpages.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mod/webpages.php b/mod/webpages.php index 7e1b32f36..6328454a6 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -73,9 +73,10 @@ function webpages_content(&$a) { else $channel_acl = array(); + require_once('include/conversation.php'); + $o = profile_tabs($a,true); - - + $o .= '<h2>' . t('Webpages') . '</h2>'; $x = array( 'webpage' => ITEM_WEBPAGE, @@ -84,7 +85,7 @@ function webpages_content(&$a) { 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), 'bang' => (($group || $cid) ? '!' : ''), 'acl' => ((local_user() && local_user() == $owner) ? populate_acl($channel_acl) : ''), - 'visitor' => 'block', + 'visitor' => true, 'profile_uid' => intval($owner), 'mimetype' => $mimetype, 'layout' => $layout, |