Page MenuHomePhabricator
Files F15422377

D8467.id.diff
No OneTemporary
Actions

D8467.id.diff
View Options

diff --git a/src/applications/conpherence/query/ConpherenceThreadQuery.php b/src/applications/conpherence/query/ConpherenceThreadQuery.php
--- a/src/applications/conpherence/query/ConpherenceThreadQuery.php
+++ b/src/applications/conpherence/query/ConpherenceThreadQuery.php
@@ -129,12 +129,20 @@
$participants = id(new ConpherenceParticipant())
->loadAllWhere('conpherencePHID IN (%Ls)', array_keys($conpherences));
$map = mgroup($participants, 'getConpherencePHID');
- foreach ($map as $conpherence_phid => $conpherence_participants) {
- $current_conpherence = $conpherences[$conpherence_phid];
+
+ foreach ($conpherences as $current_conpherence) {
+ $conpherence_phid = $current_conpherence->getPHID();
+
+ $conpherence_participants = idx(
+ $map,
+ $conpherence_phid,
+ array());
+
$conpherence_participants = mpull(
$conpherence_participants,
null,
'getParticipantPHID');
+
$current_conpherence->attachParticipants($conpherence_participants);
$current_conpherence->attachHandles(array());
}
@@ -183,13 +191,13 @@
$transactions = $query->execute();
$transactions = mgroup($transactions, 'getObjectPHID');
foreach ($conpherences as $phid => $conpherence) {
- $current_transactions = $transactions[$phid];
+ $current_transactions = idx($transactions, $phid, array());
$handles = array();
foreach ($current_transactions as $transaction) {
$handles += $transaction->getHandles();
}
$conpherence->attachHandles($conpherence->getHandles() + $handles);
- $conpherence->attachTransactions($transactions[$phid]);
+ $conpherence->attachTransactions($current_transactions);
}
return $this;
}
diff --git a/src/applications/conpherence/storage/ConpherenceThread.php b/src/applications/conpherence/storage/ConpherenceThread.php
--- a/src/applications/conpherence/storage/ConpherenceThread.php
+++ b/src/applications/conpherence/storage/ConpherenceThread.php
@@ -18,7 +18,7 @@
private $widgetData = self::ATTACHABLE;
private $images = array();
- public function initializeNewThread(PhabricatorUser $sender) {
+ public static function initializeNewThread(PhabricatorUser $sender) {
return id(new ConpherenceThread())
->setMessageCount(0)
->setTitle('');

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 23, 7:44 AM (2 w, 15 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7705370
Default Alt Text
D8467.id.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility