- $this->out->elementStart('span', 'addressees');
-
- $cnt = $this->showGroupAddressees(true);
- $cnt = $this->showProfileAddressees($cnt == 0);
-
- $this->out->elementEnd('span', 'addressees');
+ $ga = $this->getGroupAddressees();
+ $pa = $this->getProfileAddressees();
+
+ $a = array_merge($ga, $pa);
+
+ if (!empty($a)) {
+ $this->out->elementStart('span', 'addressees');
+ $first = true;
+ foreach ($a as $addr) {
+ if (!$first) {
+ // TRANS: Separator in profile addressees list.
+ $this->out->text(_m('SEPARATOR',', '));
+ } else {
+ // TRANS: Start of profile addressees list.
+ $first = false;
+ }
+ $text = $addr['text'];
+ unset($addr['text']);
+ $this->out->element('a', $addr, $text);
+ }
+ $this->out->elementEnd('span', 'addressees');
+ }