Changeset 5761

Timestamp:

06/26/2007 06:06:17 PM (16 years ago)

Author:

markjaquith

Message:

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

File:

• trunk/wp-includes/pluggable.php (modified) (2 diffs)

trunk/wp-includes/pluggable.php

@@ -195 +195 @@
                 // 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 );
@@ -208 +208 @@
                     }
                 } elseif ( $name == 'Content-Type' ) {
-                    if ( strpos( ';', $content ) !== false ) {
+                    if ( strpos( $content,';' ) !== false ) {
                         list( $type, $charset ) = explode( ';', $content );
                         $content_type = trim( $content_type );