Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index eba9874a8605d0015954b0b8dbe797ae8e04f5fe..428679ffc53e02f85f8bf573e4adb371c0557fe7 100755 (executable)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -27,7 +27,7 @@ function profile_init(&$a) {
        profile_load($a,$which,$profile);
 
        if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
-               $a->page['htmlhead'] .= '<meta name="friendika.community" content="true" />';
+               $a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
        }
        if(x($a->profile,'openidserver'))                               
                $a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
@@ -107,7 +107,7 @@ function profile_content(&$a, $update = 0) {
 
        $is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
 
-       if($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
+       if($a->user['hidewall'] && (! $is_owner) && (! $remote_contact)) {
                notice( t('Access to this profile has been restricted.') . EOL);
                return;
        }
@@ -159,7 +159,7 @@ function profile_content(&$a, $update = 0) {
         * Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
         */
 
-       $sql_extra = permissions_sql($a->profile['profile_uid'],$remote_contact,$groups);
+       $sql_extra = item_permissions_sql($a->profile['profile_uid'],$remote_contact,$groups);
 
 
        if($update) {
@@ -228,10 +228,12 @@ function profile_content(&$a, $update = 0) {
                        intval($a->profile['profile_uid']),
                        dbesc($parents_str)
                );
+               
+               $items = conv_sort($items,'created');
+       } else {
+               $items = array();
        }
 
-       $items = conv_sort($items,'created');
-
        if($is_owner && ! $update) {
                $o .= get_birthdays();
                $o .= get_events();