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/display.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/display.php')
-rw-r--r-- | mod/display.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mod/display.php b/mod/display.php index b20eb3e4f..f4d4c38c3 100644 --- a/mod/display.php +++ b/mod/display.php @@ -57,7 +57,7 @@ function display_content(&$a, $update = 0, $load = false) { 'acl' => populate_acl($channel_acl, false), 'bang' => '', - 'visitor' => 'block', + 'visitor' => true, 'profile_uid' => local_user(), 'return_path' => 'channel/' . $channel['channel_address'] ); @@ -122,6 +122,7 @@ function display_content(&$a, $update = 0, $load = false) { '$liked' => '0', '$conv' => '0', '$spam' => '0', + '$fh' => '0', '$nouveau' => '0', '$wall' => '0', '$page' => (($a->pager['page'] != 1) ? $a->pager['page'] : 1), |