aboutsummaryrefslogtreecommitdiffstats
path: root/mod/profile.php
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-07-18 23:23:18 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-07-18 23:23:18 -0700
commit9b0584e59338f0b75c6b8a9a1b5def33da5de5f6 (patch)
treee0d4e2f339f4960ff8b8bc20a3ac9d1badf0a055 /mod/profile.php
parent3c0c8a2dc1bdc196c2fb94da52c07c44c9690fd3 (diff)
downloadvolse-hubzilla-9b0584e59338f0b75c6b8a9a1b5def33da5de5f6.tar.gz
volse-hubzilla-9b0584e59338f0b75c6b8a9a1b5def33da5de5f6.tar.bz2
volse-hubzilla-9b0584e59338f0b75c6b8a9a1b5def33da5de5f6.zip
revamp of item structure
Diffstat (limited to 'mod/profile.php')
-rw-r--r--mod/profile.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/mod/profile.php b/mod/profile.php
index f14cdbd11..7a3858ba2 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -141,9 +141,9 @@ function profile_content(&$a) {
}
$sql_extra = sprintf(
" AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' )
- AND ( `deny_cid` = '' OR NOT `deny_cid` REGEXP '<%d>' )
- AND ( `allow_gid` = '' OR `allow_gid` REGEXP '%s' )
- AND ( `deny_gid` = '' OR NOT `deny_gid` REGEXP '%s') ",
+ AND ( `deny_cid` = '' OR NOT `deny_cid` REGEXP '<%d>' )
+ AND ( `allow_gid` = '' OR `allow_gid` REGEXP '%s' )
+ AND ( `deny_gid` = '' OR NOT `deny_gid` REGEXP '%s') ",
intval($_SESSION['visitor_id']),
intval($_SESSION['visitor_id']),
@@ -224,8 +224,8 @@ function profile_content(&$a) {
// known to us and is reflected in the contact-id for this item. We can use the contact url or redirect rather than
// use the link in the feed. This is different than on the network page where we may not know the author.
- $profile_name = ((strlen($item['remote-name'])) ? $item['remote-name'] : $item['name']);
- $profile_avatar = ((strlen($item['remote-avatar'])) ? $item['remote-avatar'] : $item['thumb']);
+ $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
+ $profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
$profile_link = $profile_url;
$o .= replace_macros($template,array(