forked from GNUsocial/gnu-social
Merge branch '1.0.x' into activity
This commit is contained in:
commit
be4d9082f9
@ -2641,7 +2641,8 @@ class Notice extends Managed_DataObject
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
foreach ($notices as $notice) {
|
foreach ($notices as $notice) {
|
||||||
$notice->_setFaves($faveMap[$notice->id]);
|
$faves = $faveMap[$notice->id];
|
||||||
|
$notice->_setFaves(&$faves);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2681,7 +2682,8 @@ class Notice extends Managed_DataObject
|
|||||||
$ids = self::_idsOf($notices);
|
$ids = self::_idsOf($notices);
|
||||||
$repeatMap = Memcached_DataObject::listGet('Notice', 'repeat_of', $ids);
|
$repeatMap = Memcached_DataObject::listGet('Notice', 'repeat_of', $ids);
|
||||||
foreach ($notices as $notice) {
|
foreach ($notices as $notice) {
|
||||||
$notice->_setRepeats($repeatMap[$notice->id]);
|
$repeats = $repeatMap[$notice->id];
|
||||||
|
$notice->_setRepeats(&$repeats);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user