X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fidentity.php;h=888a09ee6ff88c945384a278a1a0c2b4af3f6dc8;hb=df312402e46cc3cdc788c73d0c41874b6c71fcb3;hp=fb405b90f17b278ea035cf11f0cb4846f7504d65;hpb=64989781ff34eddb3722d32a4ff90c9c502bdfab;p=friendica.git

diff --git a/include/identity.php b/include/identity.php
index fb405b90f1..888a09ee6f 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -3,7 +3,7 @@
  * @file include/identity.php
  */
 
-require_once('include/forums.php');
+require_once('include/ForumManager.php');
 require_once('include/bbcode.php');
 require_once("mod/proxy.php");
 
@@ -237,6 +237,7 @@ function profile_sidebar($profile, $block = 0) {
 	if ($connect AND ($profile['network'] != NETWORK_DFRN) AND !isset($profile['remoteconnect']))
 		$connect = false;
 
+	$remoteconnect = NULL;
 	if (isset($profile['remoteconnect']))
 		$remoteconnect = $profile['remoteconnect'];
 
@@ -292,14 +293,15 @@ function profile_sidebar($profile, $block = 0) {
 	// check if profile is a forum
 	if((intval($profile['page-flags']) == PAGE_COMMUNITY)
 			|| (intval($profile['page-flags']) == PAGE_PRVGROUP)
-			|| (intval($profile['forum']))
-			|| (intval($profile['prv']))
-			|| (intval($profile['community'])))
+			|| (isset($profile['forum']) && intval($profile['forum']))
+			|| (isset($profile['prv']) && intval($profile['prv']))
+			|| (isset($profile['community']) && intval($profile['community'])))
 		$account_type = t('Forum');
 	else
 		$account_type = "";
 
 	if((x($profile,'address') == 1)
+			|| (x($profile,'location') == 1)
 			|| (x($profile,'locality') == 1)
 			|| (x($profile,'region') == 1)
 			|| (x($profile,'postal-code') == 1)
@@ -331,9 +333,9 @@ function profile_sidebar($profile, $block = 0) {
 		'fullname' => $profile['name'],
 		'firstname' => $firstname,
 		'lastname' => $lastname,
-		'photo300' => $a->get_cached_avatar_image($a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg'),
-		'photo100' => $a->get_cached_avatar_image($a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg'),
-		'photo50' => $a->get_cached_avatar_image($a->get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg'),
+		'photo300' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
+		'photo100' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
+		'photo50' => $a->get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg',
 	);
 
 	if (!$block){
@@ -368,6 +370,8 @@ function profile_sidebar($profile, $block = 0) {
 
 	if (isset($p["address"]))
 		$p["address"] = bbcode($p["address"]);
+	else
+		$p["address"] = bbcode($p["location"]);
 
 	if (isset($p["photo"]))
 		$p["photo"] = proxy_url($p["photo"], false, PROXY_SIZE_SMALL);
@@ -652,7 +656,7 @@ function advanced_profile(&$a) {
 	
 		//show subcribed forum if it is enabled in the usersettings
 		if (feature_enabled($uid,'forumlist_profile')) {
-			$profile['forumlist'] = array( t('Forums:'), forumlist_profile_advanced($uid));
+			$profile['forumlist'] = array( t('Forums:'), ForumManager::profile_advanced($uid));
 		}
 
 		if ($a->profile['uid'] == local_user())