mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-07-01 15:50:09 +00:00
Cast to array when using foreach(). Props santosj (and thanks for your perseverance!). fixes #2784
git-svn-id: https://develop.svn.wordpress.org/trunk@8572 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
@@ -280,7 +280,7 @@ function wp_mail( $to, $subject, $message, $headers = '' ) {
|
||||
// If it's actually got contents
|
||||
if ( !empty( $tempheaders ) ) {
|
||||
// Iterate through the raw headers
|
||||
foreach ( $tempheaders as $header ) {
|
||||
foreach ( (array) $tempheaders as $header ) {
|
||||
if ( strpos($header, ':') === false )
|
||||
continue;
|
||||
// Explode them out
|
||||
@@ -363,12 +363,12 @@ function wp_mail( $to, $subject, $message, $headers = '' ) {
|
||||
|
||||
// Add any CC and BCC recipients
|
||||
if ( !empty($cc) ) {
|
||||
foreach ($cc as $recipient) {
|
||||
foreach ( (array) $cc as $recipient ) {
|
||||
$phpmailer->AddCc( trim($recipient) );
|
||||
}
|
||||
}
|
||||
if ( !empty($bcc) ) {
|
||||
foreach ($bcc as $recipient) {
|
||||
foreach ( (array) $bcc as $recipient) {
|
||||
$phpmailer->AddBcc( trim($recipient) );
|
||||
}
|
||||
}
|
||||
@@ -401,7 +401,7 @@ function wp_mail( $to, $subject, $message, $headers = '' ) {
|
||||
|
||||
// Set custom headers
|
||||
if ( !empty( $headers ) ) {
|
||||
foreach ( $headers as $name => $content ) {
|
||||
foreach( (array) $headers as $name => $content ) {
|
||||
$phpmailer->AddCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) );
|
||||
}
|
||||
}
|
||||
@@ -789,7 +789,7 @@ function wp_sanitize_redirect($location) {
|
||||
$found = true;
|
||||
while($found) {
|
||||
$found = false;
|
||||
foreach($strip as $val) {
|
||||
foreach( (array) $strip as $val ) {
|
||||
while(strpos($location, $val) !== false) {
|
||||
$found = true;
|
||||
$location = str_replace($val, '', $location);
|
||||
|
||||
Reference in New Issue
Block a user