Merge remote branch 'upstream/master'

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 2ef37694dc2dd1a668f4c7bef941538f8e140a87..9f564843e91c77d2827fccf883011443f2c20616 100755 (executable)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -986,8 +986,8 @@ function conv_sort($arr,$order) {
                usort($parents,'sort_thr_commented');
 
        if(count($parents))
-               foreach($parents as $x) 
-                       $x['children'] = array();
+               foreach($parents as $i=>$_x) 
+                       $parents[$i]['children'] = array();
 
        foreach($arr as $x) {
                if($x['id'] != $x['parent']) {