|
@@ -55,7 +55,7 @@ if (api_get_setting('profile', 'picture') == 'true') {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-$user_info = UserManager :: get_user_info_by_id(api_get_user_id());
|
|
|
+$user_info = UserManager::get_user_info_by_id(api_get_user_id());
|
|
|
|
|
|
$social_left_content = SocialManager::show_social_menu('home');
|
|
|
|
|
@@ -70,7 +70,8 @@ $list = array(
|
|
|
|
|
|
$usergroup = new UserGroup();
|
|
|
|
|
|
-// information current user
|
|
|
+// Current user information
|
|
|
+>>>>>>> Minor - code style
|
|
|
$social_right_content .= '<div>'.Display::description($list).'</div>';
|
|
|
$social_right_content .= '
|
|
|
<div class="form-actions">
|
|
@@ -168,4 +169,4 @@ $tpl = new Template(get_lang('SocialNetwork'));
|
|
|
$tpl->assign('social_left_content', $social_left_content);
|
|
|
$tpl->assign('social_right_content', $social_right_content);
|
|
|
$social_layout = $tpl->get_template('layout/social_layout.tpl');
|
|
|
-$tpl->display($social_layout);
|
|
|
+$tpl->display($social_layout);
|