Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

strpos() is "haystack,needle", not "needle,haystack" Props pishmishy. fixes #4520

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@5761 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2007-06-26 18:06:17 +00:00
parent 1d13d95eeb
commit 829ace3e68
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/pluggable.php
View File

@ -194,20 +194,20 @@ function wp_mail( $to, $subject, $message, $headers = '' ) {
// Mainly for legacy -- process a From: header if it's there
if ( $name == 'From' ) {
if ( strpos( '<', $content ) !== false ) {
if ( strpos($content, '<' ) !== false ) {
// So... making my life hard again?
$from_name = substr( $content, 0, strpos( '<', $content ) - 1 );
$from_name = substr( $content, 0, strpos( $content, '<' ) - 1 );
$from_name = str_replace( '"', '', $from_name );
$from_name = trim( $from_name );
$from_email = substr( $content, strpos( '<', $content ) + 1 );
$from_email = substr( $content, strpos( $content, '<' ) + 1 );
$from_email = str_replace( '>', '', $from_email );
$from_email = trim( $from_email );
} else {
$from_name = trim( $content );
}
} elseif ( $name == 'Content-Type' ) {
if ( strpos( ';', $content ) !== false ) {
if ( strpos( $content,';' ) !== false ) {
list( $type, $charset ) = explode( ';', $content );
$content_type = trim( $content_type );
$charset = trim( str_replace( array( 'charset=', '"' ), '', $charset ) );