sort wall items by date order instead of id. bug #61

2 files changed, 5 insertions, 4 deletions

diff --git a/boot.php b/boot.php
index 0495c97d7..a829daf9c 100644
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.995' );
+define ( 'FRIENDIKA_VERSION',      '2.2.996' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1059      );
 
diff --git a/mod/profile.php b/mod/profile.php
index b80feab34..52551c45f 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -241,12 +241,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)
 		);