It's a wretched mess, but at least photo comments show up again when viewing the photo. This is just temporary until these conversations are merged into the common conversation viewer, so it's not worth spending a lot of time cleaning up the remnants.

include/conversation.php

@@ -1150,6 +1150,7 @@ function conv_sort($arr,$order) {
 	elseif(stristr($order,'ascending'))
 		usort($parents,'sort_thr_created_rev');
 
+
 	if(count($parents))
 		foreach($parents as $i=>$_x)
 			$parents[$i]['children'] = get_item_children($arr, $_x);