Merge remote-tracking branch 'friendica/master'

diff --cc include/conversation.php
index f4dd01ddeb3363ac502b4a2989b8e47038c0f678,f4432bfd977e1633ec534b81199162867c258b41..26430d645caf0bf62907d845a4d62e59cf95d607
--- 1/include/conversation.php
--- 2/include/conversation.php
+++ b/include/conversation.php
@@@ -892,3 -884,63 +892,63 @@@ function status_editor($a,$x, $notes_ci
  
        return $o;
  }
 -}
+ 
+ 
+ function conv_sort($arr,$order) {
+ 
+       if((!(is_array($arr) && count($arr))))
+               return array();
+ 
+       $parents = array();
+ 
+       foreach($arr as $x)
+               if($x['id'] == $x['parent'])
+                               $parents[] = $x;
+ 
+       if(stristr($order,'created'))
+               usort($parents,'sort_thr_created');
+       elseif(stristr($order,'commented'))
+               usort($parents,'sort_thr_commented');
+ 
+       foreach($parents as $x) 
+               $x['children'] = array();
+ 
+       foreach($arr as $x) {
+               if($x['id'] != $x['parent']) {
+                       $p = find_thread_parent_index($parents,$x);
+                       $parents[$p]['children'][] = $x;
+               }
+       }
+       foreach($parents as $x)
+               if(count($x['children']))
+                       usort($x['children'],'sort_thr_created_rev');
+ 
+       $ret = array();
+       foreach($parents as $x) {
+               $ret[] = $x;
+               if(count($x['children']))
+                       foreach($x['children'] as $y)
+                               $ret[] = $y;
+       }
+ 
+       return $ret;
+ }
+ 
+ 
+ function sort_thr_created($a,$b) {
+       return strcmp($b['created'],$a['created']);
+ }
+ 
+ function sort_thr_created_rev($a,$b) {
+       return strcmp($a['created'],$b['created']);
+ }
+ 
+ function sort_thr_commented($a,$b) {
+       return strcmp($b['commented'],$a['commented']);
+ }
+ 
+ function find_thread_parent_index($arr,$x) {
+       foreach($arr as $k => $v)
+               if($v['id'] == $x['parent'])
+                       return $k;
++}