X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile.php;h=587ac6288e7b1cfa60b7a5dded955091bddf6a95;hb=285d617569f525b213318bcb2eadcbb34400e4f3;hp=b80feab34a186192a07c9e54202a7f1712c0e44d;hpb=69f014d02b0d53ac2b42cbebe3d30418a2d0f612;p=friendica.git

diff --git a/mod/profile.php b/mod/profile.php
index b80feab34a..587ac6288e 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -115,7 +115,9 @@ function profile_content(&$a, $update = 0) {
 			'$phototab' => $a->get_baseurl() . '/photos/' . $a->profile['nickname'],
 			'$status' => t('Status'),
 			'$profile' => t('Profile'),
-			'$photos' => t('Photos')
+			'$photos' => t('Photos'),
+			'$events' => (($is_owner) ? 	'<a href="events" id="profile-tab-events-link" class="profile-tabs" >' . t('Events') . '</a>' : ''),
+			'$notes' => (($is_owner) ? 	'<a href="notes" id="profile-tab-notes-link" class="profile-tabs" >' . t('Personal Notes') . '</a>' : '')
 		));
 
 
@@ -126,6 +128,9 @@ function profile_content(&$a, $update = 0) {
 			return $o;
 		}
 
+		if(x($_SESSION,'new_member') && $_SESSION['new_member'] && $is_owner)
+			$o .= '<a href="newmember">' . t('Tips for New Members') . '</a>' . EOL;
+
 		$commpage = (($a->profile['page-flags'] == PAGE_COMMUNITY) ? true : false);
 		$commvisitor = (($commpage && $remote_contact == true) ? true : false);
 
@@ -241,12 +246,13 @@ function profile_content(&$a, $update = 0) {
 			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`, `contact`.`rel`, 
 			`contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
 			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
-			FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+			FROM `item`, (SELECT `p`.`id`,`p`.`created` FROM `item` AS `p` WHERE `p`.`parent` = `p`.`id`) AS `parentitem`, `contact`
 			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+			AND `contact`.`id` = `item`.`contact-id`
 			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-			AND `item`.`parent` IN ( %s )
+			AND `item`.`parent` = `parentitem`.`id` AND `item`.`parent` IN ( %s )
 			$sql_extra
-			ORDER BY `parent` DESC, `gravity` ASC, `item`.`id` ASC ",
+			ORDER BY `parentitem`.`created` DESC, `gravity` ASC, `item`.`created` ASC ",
 			intval($a->profile['profile_uid']),
 			dbesc($parents_str)
 		);
@@ -255,11 +261,8 @@ function profile_content(&$a, $update = 0) {
 	if($is_owner && ! $update)
 		$o .= get_birthdays();
 
-
-
 	$o .= conversation($a,$r,'profile',$update);
 
-
 	if(! $update) {
 		
 		$o .= paginate($a);