aboutsummaryrefslogtreecommitdiffstats
path: root/mod/display.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-29 15:09:35 -0800
committerfriendica <info@friendica.com>2015-01-29 15:09:35 -0800
commit912be23e1627211fb417c4b7bced414cbbe38ef0 (patch)
tree2b8567d800624167b3eadf37c8855deb0ba74b0b /mod/display.php
parentff68ea608786a698ad46637ef13854ac1b1e6beb (diff)
parent872b165eb2bb5d632a12f2d7e1a28e195c2d5348 (diff)
downloadvolse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.gz
volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.bz2
volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.zip
Merge branch 'master' into tres
Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php
Diffstat (limited to 'mod/display.php')
-rw-r--r--mod/display.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/mod/display.php b/mod/display.php
index b61931169..d1cda4e80 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -5,7 +5,7 @@ function display_content(&$a, $update = 0, $load = false) {
// logger("mod-display: update = $update load = $load");
- if(intval(get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+ if(intval(get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
notice( t('Public access denied.') . EOL);
return;
}
@@ -36,7 +36,7 @@ function display_content(&$a, $update = 0, $load = false) {
$observer_is_owner = false;
- if(local_user() && (! $update)) {
+ if(local_channel() && (! $update)) {
$channel = $a->get_channel();
@@ -58,7 +58,7 @@ function display_content(&$a, $update = 0, $load = false) {
'acl' => populate_acl($channel_acl),
'bang' => '',
'visitor' => true,
- 'profile_uid' => local_user(),
+ 'profile_uid' => local_channel(),
'return_path' => 'channel/' . $channel['channel_address']
);
@@ -109,7 +109,7 @@ function display_content(&$a, $update = 0, $load = false) {
$o .= '<div id="live-display"></div>' . "\r\n";
- $o .= "<script> var profile_uid = " . ((intval(local_user())) ? local_user() : (-1))
+ $o .= "<script> var profile_uid = " . ((intval(local_channel())) ? local_channel() : (-1))
. "; var netargs = '?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
$a->page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array(
@@ -160,13 +160,13 @@ function display_content(&$a, $update = 0, $load = false) {
$sys = get_sys_channel();
$sysid = $sys['channel_id'];
- if(local_user()) {
+ if(local_channel()) {
$r = q("SELECT * from item
WHERE item_restrict = 0
and uid = %d
and mid = '%s'
limit 1",
- intval(local_user()),
+ intval(local_channel()),
dbesc($target_item['parent_mid'])
);
if($r) {
@@ -232,7 +232,7 @@ function display_content(&$a, $update = 0, $load = false) {
if($updateable) {
$x = q("UPDATE item SET item_unseen = 0 where item_unseen = 1 AND uid = %d and parent = %d ",
- intval(local_user()),
+ intval(local_channel()),
intval($r[0]['parent'])
);
}