Changeset 8754

Timestamp:

08/27/2008 08:47:01 PM (13 years ago)

Author:

westi

Message:

Performance improvements using strpos. Fixes #7611 and #7610 props johnbillion.

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-includes/query.php (modified) (1 diff)
• wp-login.php (modified) (1 diff)
• wp-mail.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -26 +26 @@
     $s = $_GET['q']; // is this slashed already?
 
-    if ( strstr( $s, ',' ) ) {
+    if ( false !== strpos( $s, ',' ) ) {
         $s = explode( ',', $s );
         $s = $s[count( $s ) - 1];

trunk/wp-includes/query.php

@@ -1753 +1753 @@
         $more = 1;
     $content = $post->post_content;
-    if ( preg_match('/<!--nextpage-->/', $content) ) {
+    if ( strpos( $content, '<!--nextpage-->' ) ) {
         if ( $page > 1 )
             $more = 1;

trunk/wp-login.php

@@ -104 +104 @@
         $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.'));
 
-    if ( strstr($_POST['user_login'], '@') ) {
+    if ( strpos($_POST['user_login'], '@') ) {
         $user_data = get_user_by_email(trim($_POST['user_login']));
         if ( empty($user_data) )

trunk/wp-mail.php

@@ -61 +61 @@
                 $content_transfer_encoding = $content_transfer_encoding[0];
             }
-            if (($content_type == 'multipart/alternative') && (preg_match('/boundary="/', $line)) && ($boundary == '')) {
+            if (($content_type == 'multipart/alternative') && (false !== strpos($line, 'boundary="')) && ($boundary == '')) {
                 $boundary = trim($line);
                 $boundary = explode('"', $boundary);