merge comment threading, provide plugin/theme functions to handle css/js includes

1 files changed, 6 insertions, 2 deletions

diff --git a/mod/notes.php b/mod/notes.php
index 625bbd2ee..afaa60f70 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -129,9 +129,13 @@ function notes_content(&$a,$update = false) {
 			intval(local_user()),
 			dbesc($parents_str)
 		);
-	}
 
-	$o .= conversation($a,$r,'notes',$update);
+		if(count($r)) {
+			$items = conv_sort($r,"`commented`");
+
+			$o .= conversation($a,$items,'notes',$update);
+		}
+	}
 
 
 	$o .= paginate($a);