Skip to content

Commit 0fd0eb6

Browse files
author
Eoghan O'Brien
committed
Refactor the addMailHeaders method
1 parent b826dc9 commit 0fd0eb6

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

Diff for: class.simple_mail.php

+4-7
Original file line numberDiff line numberDiff line change
@@ -317,15 +317,12 @@ public function addMailHeaders($header, array $pairs)
317317
'You must pass at least one name => email pair.'
318318
);
319319
}
320+
$addresses = array();
320321
foreach ($pairs as $name => $email) {
321-
if (is_numeric($name)) {
322-
$addresses[] = $this->formatHeader($email);
323-
} else {
324-
$addresses[] = $this->formatHeader($email, $name);
325-
}
322+
$name = is_numeric($name) ? null : $name;
323+
$addresses[] = $this->formatHeader($email, $name);
326324
}
327-
$addresses = implode(',', $addresses);
328-
$this->addGenericHeader($header, $addresses);
325+
$this->addGenericHeader($header, implode(',', $addresses));
329326
return $this;
330327
}
331328

0 commit comments

Comments
 (0)