Changeset 4990

Timestamp:

03/07/2007 05:29:15 AM (18 years ago)

Author:

markjaquith

Message:

Use strpos instead of strstr where ever possible, for speed. Props rob1n. fixes #3920

Location:

trunk

Files:

• app.php (modified) (2 diffs)
• wp-admin/admin-functions.php (modified) (5 diffs)
• wp-admin/edit-link-form.php (modified) (1 diff)
• wp-admin/import/blogger.php (modified) (2 diffs)
• wp-admin/menu.php (modified) (1 diff)
• wp-admin/options.php (modified) (1 diff)
• wp-admin/page.php (modified) (1 diff)
• wp-admin/post.php (modified) (1 diff)
• wp-admin/templates.php (modified) (1 diff)
• wp-admin/upgrade-functions.php (modified) (2 diffs)
• wp-blog-header.php (modified) (1 diff)
• wp-content/themes/default/functions.php (modified) (2 diffs)
• wp-includes/classes.php (modified) (2 diffs)
• wp-includes/comment-template.php (modified) (1 diff)
• wp-includes/feed.php (modified) (1 diff)
• wp-includes/formatting.php (modified) (4 diffs)
• wp-includes/functions.php (modified) (3 diffs)
• wp-includes/general-template.php (modified) (1 diff)
• wp-includes/link-template.php (modified) (2 diffs)
• wp-includes/pluggable.php (modified) (1 diff)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/query.php (modified) (6 diffs)
• wp-includes/rewrite.php (modified) (2 diffs)
• wp-includes/vars.php (modified) (1 diff)
• wp-includes/wp-db.php (modified) (1 diff)
• wp-settings.php (modified) (3 diffs)

trunk/app.php

@@ -193 +193 @@
             } else {
                 $endtag = $this->ns_to_prefix($name);
-                if(strstr($this->in_content[count($this->in_content)-1], "<$endtag")) {
+                if (strpos($this->in_content[count($this->in_content)-1], '<' . $endtag) !== false)
                     array_push($this->in_content, "/>");
                 } else {
@@ -221 +221 @@
         if(!empty($this->in_content)) {
             // handle self-closing tags (case: text node found, need to close element started)
-            if(strstr($this->in_content[count($this->in_content)-1], "<")) {
+            if (strpos($this->in_content[count($this->in_content)-1], '<') !== false) {
                 array_push($this->in_content, ">");
             }

trunk/wp-admin/admin-functions.php

@@ -1144 +1144 @@
             $state = true;
             foreach ( $markerdata as $n => $markerline ) {
-                if ( strstr( $markerline, "# BEGIN {$marker}" ))
+                if (strpos($markerline, '# BEGIN ' . $marker) !== false)
                     $state = false;
                 if ( $state ) {
@@ -1152 +1152 @@
                         fwrite( $f, "{$markerline}" );
                 }
-                if ( strstr( $markerline, "# END {$marker}" ) ) {
+                if (strpos($markerline, '# END ' . $marker) !== false) {
                     fwrite( $f, "# BEGIN {$marker}\n" );
                     if ( is_array( $insertion ))
@@ -1190 +1190 @@
         $state = false;
         foreach ( $markerdata as $markerline ) {
-            if ( strstr( $markerline, "# END {$marker}" ))
+            if (strpos($markerline, '# END ' . $marker) !== false)
                 $state = false;
             if ( $state )
                 $result[] = $markerline;
-            if ( strstr( $markerline, "# BEGIN {$marker}" ))
+            if (strpos($markerline, '# BEGIN ' . $marker) !== false)
                 $state = true;
         }
@@ -1767 +1767 @@
         ';
 }
-if ( strstr( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ))
+
+if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)
     add_action( 'admin_footer', 'browse_happy' );
 
@@ -1928 +1929 @@
     $size = strtolower( ini_get( 'upload_max_filesize' ) );
     $bytes = 0;
-    if ( strstr( $size, 'k' ) )
+    if (strpos($size, 'k') !== false)
         $bytes = $size * 1024;
-    if ( strstr( $size, 'm' ) )
+    if (strpos($size, 'm') !== false)
         $bytes = $size * 1024 * 1024;
-    if ( strstr( $size, 'g' ) )
+    if (strpos($size, 'g') !== false)
         $bytes = $size * 1024 * 1024 * 1024;
 ?>

trunk/wp-admin/edit-link-form.php

@@ -23 +23 @@
 
     if ('' == $value) {
-        if ('family' == $class && !strstr($link_rel, 'child') && !strstr($link_rel, 'parent') && !strstr($link_rel, 'sibling') && !strstr($link_rel, 'spouse') && !strstr($link_rel, 'kin')) echo ' checked="checked"';
-        if ('friendship' == $class && !strstr($link_rel, 'friend') && !strstr($link_rel, 'acquaintance') && !strstr($link_rel, 'contact') ) echo ' checked="checked"';
-        if ('geographical' == $class && !strstr($link_rel, 'co-resident') && !strstr($link_rel, 'neighbor') ) echo ' checked="checked"';
+        if ('family' == $class && strpos($link_rel, 'child') === false && strpos($link_rel, 'parent') === false && strpos($link_rel, 'sibling') === false && strpos($link_rel, 'spouse') === false && strpos($link_rel, 'kin') === false) echo ' checked="checked"';
+        if ('friendship' == $class && strpos($link_rel, 'friend') === false && strpos($link_rel, 'acquaintance') === false && strpos($link_rel, 'contact') === false) echo ' checked="checked"';
+        if ('geographical' == $class && strpos($link_rel, 'co-resident') === false && strpos($link_rel, 'neighbor') === false) echo ' checked="checked"';
         if ('identity' == $class && in_array('me', $rels) ) echo ' checked="checked"';
     }

trunk/wp-admin/import/blogger.php

@@ -942 +942 @@
             } else {
                 $endtag = $this->ns_to_prefix($name);
-                if(strstr($this->in_content[count($this->in_content)-1], "<$endtag")) {
+                if (strpos($this->in_content[count($this->in_content)-1], '<' . $endtag) !== false) {
                     array_push($this->in_content, "/>");
                 } else {
@@ -970 +970 @@
         if(!empty($this->in_content)) {
             // handle self-closing tags (case: text node found, need to close element started)
-            if(strstr($this->in_content[count($this->in_content)-1], "<")) {
+            if (strpos($this->in_content[count($this->in_content)-1], '<') !== false) {
                 array_push($this->in_content, ">");
             }

trunk/wp-admin/menu.php

@@ -7 +7 @@
 $menu[0] = array(__('Dashboard'), 'read', 'index.php');
 
-if ( strstr($_SERVER['REQUEST_URI'], 'edit-pages.php') )
+if (strpos($_SERVER['REQUEST_URI'], 'edit-pages.php') !== false)
     $menu[5] = array(__('Write'), 'edit_pages', 'page-new.php');
 else
     $menu[5] = array(__('Write'), 'edit_posts', 'post-new.php');
-if ( strstr($_SERVER['REQUEST_URI'], 'page-new.php') )
+if (strpos($_SERVER['REQUEST_URI'], 'page-new.php') !== false)
     $menu[10] = array(__('Manage'), 'edit_pages', 'edit-pages.php');
 else

trunk/wp-admin/options.php

@@ -149 +149 @@
 <td>";
 
-    if (stristr($value, "\n")) echo "<textarea class='$class' name='$option->option_name' id='$option->option_name' cols='30' rows='5'>$value</textarea>";
+    if (strpos($value, "\n") !== false) echo "<textarea class='$class' name='$option->option_name' id='$option->option_name' cols='30' rows='5'>$value</textarea>";
     else echo "<input class='$class' type='text' name='$option->option_name' id='$option->option_name' size='30' value='" . $value . "'$disabled />";
 

trunk/wp-admin/page.php

@@ -149 +149 @@
 
     $sendback = wp_get_referer();
-    if (strstr($sendback, 'page.php')) $sendback = get_option('siteurl') .'/wp-admin/page.php';
-    elseif (strstr($sendback, 'attachments.php')) $sendback = get_option('siteurl') .'/wp-admin/attachments.php';
+    if (strpos($sendback, 'page.php') !== false) $sendback = get_option('siteurl') .'/wp-admin/page.php';
+    elseif (strpos($sendback, 'attachments.php') !== false) $sendback = get_option('siteurl') .'/wp-admin/attachments.php';
     $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
     wp_redirect($sendback);

trunk/wp-admin/post.php

@@ -161 +161 @@
 
     $sendback = wp_get_referer();
-    if (strstr($sendback, 'post.php')) $sendback = get_option('siteurl') .'/wp-admin/post-new.php';
-    elseif (strstr($sendback, 'attachments.php')) $sendback = get_option('siteurl') .'/wp-admin/attachments.php';
+    if (strpos($sendback, 'post.php') !== false) $sendback = get_option('siteurl') .'/wp-admin/post-new.php';
+    elseif (strpos($sendback, 'attachments.php') !== false) $sendback = get_option('siteurl') .'/wp-admin/attachments.php';
     $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback);
     wp_redirect($sendback);

trunk/wp-admin/templates.php

@@ -53 +53 @@
         wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
 
-    if ( strstr( $file, 'wp-config.php' ) )
+    if (strpos($file, 'wp-config.php') !== false)
     wp_die('<p>'.__('The config file cannot be edited or viewed through the web interface. Sorry!').'</p>');
 

trunk/wp-admin/upgrade-functions.php

@@ -923 +923 @@
         if ($oldfile == 'index.php') { // Check to make sure it's not a new index
             $index = implode('', file("$oldpath/$oldfile"));
-            if ( strstr( $index, 'WP_USE_THEMES' ) ) {
+            if (strpos($index, 'WP_USE_THEMES') !== false) {
                 if (! @copy(ABSPATH . 'wp-content/themes/default/index.php', "$site_dir/$newfile"))
                     return false;
@@ -995 +995 @@
 
         foreach ($stylelines as $line) {
-            if (strstr($line, "Theme Name:")) $line = "Theme Name: $theme_name";
-            elseif (strstr($line, "Theme URI:")) $line = "Theme URI: " . __get_option('siteurl');
-            elseif (strstr($line, "Description:")) $line = "Description: Your theme";
-            elseif (strstr($line, "Version:")) $line = "Version: 1";
-            elseif (strstr($line, "Author:")) $line = "Author: You";
-            fwrite($f, "{$line}\n");
+            if (strpos($line, 'Theme Name:') !== false) $line = 'Theme Name: ' . $theme_name;
+            elseif (strpos($line, 'Theme URI:') !== false) $line = 'Theme URI: ' . __get_option('url');
+            elseif (strpos($line, 'Description:') !== false) $line = 'Description: Your theme.';
+            elseif (strpos($line, 'Version:') !== false) $line = 'Version: 1';
+            elseif (strpos($line, 'Author:') !== false) $line = 'Author: You';
+            fwrite($f, $line . "\n");
         }
         fclose($f);

trunk/wp-blog-header.php

@@ -3 +3 @@
 if (! isset($wp_did_header)):
 if ( !file_exists( dirname(__FILE__) . '/wp-config.php') ) {
-    if ( strstr( $_SERVER['PHP_SELF'], 'wp-admin') ) $path = '';
+    if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '';
     else $path = 'wp-admin/';
 

trunk/wp-content/themes/default/functions.php

@@ -26 +26 @@
 
 function kubrick_upper_color() {
-    if ( strstr( $url = kubrick_header_image_url(), 'header-img.php?' ) ) {
+    if (strpos($url = kubrick_header_image_url(), 'header-img.php?') !== false) {
         parse_str(substr($url, strpos($url, '?') + 1), $q);
         return $q['upper'];
@@ -34 +34 @@
 
 function kubrick_lower_color() {
-    if ( strstr( $url = kubrick_header_image_url(), 'header-img.php?' ) ) {
+    if (strpos($url = kubrick_header_image_url(), 'header-img.php?') !== false) {
         parse_str(substr($url, strpos($url, '?') + 1), $q);
         return $q['lower'];

trunk/wp-includes/classes.php

@@ -121 +121 @@
 
             // If req_uri is empty or if it is a request for ourself, unset error.
-            if ( empty($request) || $req_uri == $self || strstr($_SERVER['PHP_SELF'], 'wp-admin/') ) {
+            if (empty($request) || $req_uri == $self || strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false) {
                 if (isset($_GET['error']))
                     unset($_GET['error']);
@@ -128 +128 @@
                     unset($error);
 
-                if ( isset($perma_query_vars) && strstr($_SERVER['PHP_SELF'], 'wp-admin/') )
+                if (isset($perma_query_vars) && strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false)
                     unset($perma_query_vars);
 

trunk/wp-includes/comment-template.php

@@ -240 +240 @@
 function trackback_rdf($timezone = 0) {
     global $id;
-    if (!stristr($_SERVER['HTTP_USER_AGENT'], 'W3C_Validator')) {
-    echo '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-            xmlns:dc="http://purl.org/dc/elements/1.1/"
-            xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/">
-        <rdf:Description rdf:about="';
-    the_permalink();
-    echo '"'."\n";
-    echo '    dc:identifier="';
-    the_permalink();
-    echo '"'."\n";
-    echo '    dc:title="'.str_replace('--', '&#x2d;&#x2d;', wptexturize(strip_tags(get_the_title()))).'"'."\n";
-    echo '    trackback:ping="'.trackback_url(0).'"'." />\n";
-    echo '</rdf:RDF>';
+    if (strpos($_SERVER['HTTP_USER_AGENT'], 'W3C_Validator') !== false) {
+        echo '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+                xmlns:dc="http://purl.org/dc/elements/1.1/"
+                xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/">
+            <rdf:Description rdf:about="';
+        the_permalink();
+        echo '"'."\n";
+        echo '    dc:identifier="';
+        the_permalink();
+        echo '"'."\n";
+        echo '    dc:title="'.str_replace('--', '&#x2d;&#x2d;', wptexturize(strip_tags(get_the_title()))).'"'."\n";
+        echo '    trackback:ping="'.trackback_url(0).'"'." />\n";
+        echo '</rdf:RDF>';
     }
 }

trunk/wp-includes/feed.php

@@ -166 +166 @@
 function html_type_rss() {
     $type = get_bloginfo('html_type');
-    if ( strstr( $type, 'xhtml' ) )
+    if (strpos($type, 'xhtml') !== false)
         $type = 'xhtml';
     else

trunk/wp-includes/formatting.php

@@ -30 +30 @@
             // static strings
             $curl = str_replace($static_characters, $static_replacements, $curl);
-
             // regular expressions
             $curl = preg_replace($dynamic_characters, $dynamic_replacements, $curl);
-        } elseif ( strstr($curl, '<code') || strstr($curl, '<pre') || strstr($curl, '<kbd') || strstr($curl, '<style') || strstr($curl, '<script') ) { 
+        } elseif (strpos($curl, '<code') !== false || strpos($curl, '<pre') !== false || strpos($curl, '<kbd') !== false || strpos($curl, '<style') !== false || strpos($curl, '<script') !== false) {
             $next = false;
         } else {
@@ -79 +78 @@
     $pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*<br />!', "$1", $pee);
     $pee = preg_replace('!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee);
-    if ( strstr( $pee, '<pre' ) )
+    if (strpos($pee, '<pre') !== false)
         $pee = preg_replace('!(<pre.*?>)(.*?)</pre>!ise', " stripslashes('$1') .  stripslashes(clean_pre('$2'))  . '</pre>' ", $pee);
     $pee = preg_replace( "|\n</p>$|", '</p>', $pee );
@@ -659 +658 @@
 function is_email($user_email) {
     $chars = "/^([a-z0-9+_]|\\-|\\.)+@(([a-z0-9_]|\\-)+\\.)+[a-z]{2,6}\$/i";
-    if(strstr($user_email, '@') && strstr($user_email, '.')) {
+    if (strpos($user_email, '@') !== false && strpos($user_email, '.') !== false) {
         if (preg_match($chars, $user_email)) {
             return true;
@@ -1073 +1072 @@
     $url = str_replace($strip, '', $url);
     $url = str_replace(';//', '://', $url);
-    $url = (!strstr($url, '://')) ? 'http://'.$url : $url;
+    $url = (strpos($url, '://') === false) ? 'http://'.$url : $url;
     $url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&#038;$1', $url);
     if ( !is_array($protocols) )

trunk/wp-includes/functions.php

@@ -781 +781 @@
     }
 
-    if ( strstr($uri, '?') ) {
+    if (strpos($uri, '?') !== false) {
         $parts = explode('?', $uri, 2);
         if ( 1 == count($parts) ) {
@@ -790 +790 @@
             $query = $parts[1];
         }
-    } else if ( !empty($protocol) || strstr($uri, '/') ) {
+    } elseif (!empty($protocol) || strpos($uri, '/') !== false) {
         $base = $uri . '?';
         $query = '';
@@ -1338 +1338 @@
         $title = __('WordPress › Error');
 
-    if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') )
+    if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false)
         $admin_dir = '';
     else

trunk/wp-includes/general-template.php

@@ -555 +555 @@
     }
 
-
-
-    if ( strstr($_SERVER['HTTP_USER_AGENT'], 'MSIE') || strstr(strtolower($_SERVER['HTTP_USER_AGENT']), 'camino') || strstr(strtolower($_SERVER['HTTP_USER_AGENT']), 'safari') )
+    if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false || strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'camino') !== false || strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'safari') !== false)
         $ak_title_separator = "\n";
     else

trunk/wp-includes/link-template.php

@@ -71 +71 @@
 
         $category = '';
-        if ( strstr($permalink, '%category%') ) {
+        if (strpos($permalink, '%category%') !== false) {
             $cats = get_the_category($post->ID);
             $category = $cats[0]->category_nicename;
@@ -159 +159 @@
         else
             $parentlink = get_permalink( $object->post_parent );
-        if (! strstr($parentlink, '?') )
+        if (strpos($parentlink, '?') === false)
             $link = trim($parentlink, '/') . '/' . $object->post_name . '/';
     }

trunk/wp-includes/pluggable.php

@@ -281 +281 @@
     $referer = strtolower(wp_get_referer());
     if ( !wp_verify_nonce($_REQUEST['_wpnonce'], $action) &&
-        !(-1 == $action && strstr($referer, $adminurl)) ) {
+        !(-1 == $action && strpos($referer, $adminurl) !== false))
         wp_nonce_ays($action);
         die();

trunk/wp-includes/post.php

@@ -1199 +1199 @@
 
 function is_local_attachment($url) {
-    if ( !strstr($url, get_bloginfo('url') ) )
-        return false;
-    if ( strstr($url, get_bloginfo('url') . '/?attachment_id=') )
+    if (strpos($url, get_bloginfo('url')) === false)
+        return false;
+    if (strpos($url, get_bloginfo('url') . '/?attachment_id=') !== false)
         return true;
     if ( $id = url_to_postid($url) ) {

trunk/wp-includes/query.php

@@ -30 +30 @@
     global $wp_query;
 
-    return ( $wp_query->is_admin || strstr($_SERVER['REQUEST_URI'], 'wp-admin/') );
+    return ($wp_query->is_admin || (strpos($_SERVER['REQUEST_URI'], 'wp-admin/') !== false));
 }
 
@@ -511 +511 @@
                 $this->is_category = false;
             } else {
-                if (stristr($qv['cat'],'-')) {
+                if (strpos($qv['cat'], '-') !== false) {
                     $this->is_category = false;
                 } else {
@@ -558 +558 @@
         }
 
-        if (strstr($_SERVER['PHP_SELF'], 'wp-admin/')) {
+        if (strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false) {
             $this->is_admin = true;
         }
@@ -851 +851 @@
             foreach ( $cat_array as $cat ) {
                 $cat = intval($cat);
-                $in = strstr($cat, '-') ? false : true;
+                $in = (strpos($cat, '-') !== false) ? false : true;
                 $cat = trim($cat, '-');
                 if ( $in )
@@ -919 +919 @@
             $q['author'] = ''.urldecode($q['author']).'';
             $q['author'] = addslashes_gpc($q['author']);
-            if (stristr($q['author'], '-')) {
+            if (strpos($q['author'], '-') !== false) {
                 $eq = '!=';
                 $andor = 'AND';
@@ -939 +939 @@
 
         if ('' != $q['author_name']) {
-            if (stristr($q['author_name'],'/')) {
+            if (strpos($q['author_name'], '/') !== false) {
                 $q['author_name'] = explode('/',$q['author_name']);
                 if ($q['author_name'][count($q['author_name'])-1]) {

trunk/wp-includes/rewrite.php

@@ -592 +592 @@
                 //2) post ID, 3) page name, 4) timestamp (year, month, day, hour, second and
                 //minute all present). Set these flags now as we need them for the endpoints.
-                if (strstr($struct, '%postname%') || strstr($struct, '%post_id%')
-                        || strstr($struct, '%pagename%')
-                        || (strstr($struct, '%year%') &&  strstr($struct, '%monthnum%') && strstr($struct, '%day%') && strstr($struct, '%hour%') && strstr($struct, '%minute') && strstr($struct, '%second%'))) {
+                if (strpos($struct, '%postname%') !== false || strpos($struct, '%post_id%') !== false
+                        || strpos($struct, '%pagename%') !== false
+                        || (strpos($struct, '%year%') !== false && strpos($struct, '%monthnum%') !== false && strpos($struct, '%day%') !== false && strpos($struct, '%hour%') !== false && strpos($struct, '%minute%') !== false && strpos($struct, '%second%') !== false)) {
                     $post = true;
-                    if  ( strstr($struct, '%pagename%') )
+                    if (strpos($struct, '%pagename%') !== false)
                         $page = true;
                 }
@@ -810 +810 @@
                 }
 
-                if (strstr($query, $this->index)) {
+                if (strpos($query, $this->index) !== false) {
                     $rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
                 } else {

trunk/wp-includes/vars.php

@@ -33 +33 @@
 
 // Server detection
-$is_apache = ( strstr($_SERVER['SERVER_SOFTWARE'], 'Apache') || strstr($_SERVER['SERVER_SOFTWARE'], 'LiteSpeed') ) ? 1 : 0;
-$is_IIS = strstr($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') ? 1 : 0;
+$is_apache ((strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false) || (strpos($_SERVER['SERVER_SOFTWARE'], 'LiteSpeed') !== false)) ? 1 : 0;
+$is_IIS = (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false) ? 1 : 0;
 
 // if the config file does not provide the smilies array, let's define it here

trunk/wp-includes/wp-db.php

@@ -373 +373 @@
         header('Content-Type: text/html; charset=utf-8');
 
-        if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') )
+        if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false)
             $admin_dir = '';
         else

trunk/wp-settings.php

@@ -41 +41 @@
 
 // Fix for Dreamhost and other PHP as CGI hosts
-if ( strstr( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) )
+if (strpos($_SERVER['SCRIPT_NAME'], 'php.cgi') !== false)
     unset($_SERVER['PATH_INFO']);
 
@@ -141 +141 @@
 require_once (ABSPATH . WPINC . '/l10n.php');
 
-if ( !is_blog_installed() && (!strstr($_SERVER['PHP_SELF'], 'install.php') && !defined('WP_INSTALLING')) ) {
-    if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') )
+if ( !is_blog_installed() && (strpos($_SERVER['PHP_SELF'], 'install.php') === false && !defined('WP_INSTALLING')) ) {
+    if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false)
         $link = 'install.php';
     else
@@ -173 +173 @@
 require (ABSPATH . WPINC . '/script-loader.php');
 
-if (!strstr($_SERVER['PHP_SELF'], 'install.php')) :
+if (strpos($_SERVER['PHP_SELF'], 'install.php') === false) {
     // Used to guarantee unique hash cookies
     $cookiehash = md5(get_option('siteurl'));
     define('COOKIEHASH', $cookiehash); 
-endif;
+}
 
 if ( !defined('USER_COOKIE') )