Ticket #46846: 46846.diff

wp-includes/formatting.php

@@ -2752 +2752 @@
         $email_no_spam_address = '';
         for ( $i = 0, $len = strlen( $email_address ); $i < $len; $i++ ) {
                 $j = rand( 0, 1 + $hex_encoding );
-                if ( $j == 0 ) {
+                if ( 0 === $j ) {
                         $email_no_spam_address .= '&#' . ord( $email_address[ $i ] ) . ';';
-                } elseif ( $j == 1 ) {
+                } elseif ( 1 === $j ) {
                         $email_no_spam_address .= $email_address[ $i ];
-                } elseif ( $j == 2 ) {
+                } elseif ( 2 === $j ) {
                         $email_no_spam_address .= '%' . zeroise( dechex( ord( $email_address[ $i ] ) ), 2 );
                 }
         }
@@ -3161 +3161 @@
 function translate_smiley( $matches ) {
         global $wpsmiliestrans;
 
-        if ( count( $matches ) == 0 ) {
+        if ( 0 === count( $matches ) ) {
                 return '';
         }
 
@@ -3220 +3220 @@
                         $content = $textarr[ $i ];
 
                         // If we're in an ignore block, wait until we find its closing tag
-                        if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) ) {
+                        if ( '' === $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) ) {
                                 $ignore_block_element = $matches[1];
                         }
 
                         // If it's not a tag and not in ignore block
-                        if ( '' == $ignore_block_element && strlen( $content ) > 0 && '<' != $content[0] ) {
+                        if ( '' === $ignore_block_element && strlen( $content ) > 0 && '<' !== $content[0] ) {
                                 $content = preg_replace_callback( $wp_smiliessearch, 'translate_smiley', $content );
                         }
 
                         // did we exit ignore block
-                        if ( '' != $ignore_block_element && '</' . $ignore_block_element . '>' == $content ) {
+                        if ( '' !== $ignore_block_element && '</' . $ignore_block_element . '>' === $content ) {
                                 $ignore_block_element = '';
                         }
 
@@ -3278 +3278 @@
         }
 
         // Test for an @ character after the first position
-        if ( strpos( $email, '@', 1 ) === false ) {
+        if ( false === strpos( $email, '@', 1 ) ) {
                 /** This filter is documented in wp-includes/formatting.php */
                 return apply_filters( 'is_email', false, $email, 'email_no_at' );
         }
@@ -3446 +3446 @@
  */
 function iso8601_timezone_to_offset( $timezone ) {
         // $timezone is either 'Z' or '[+|-]hhmm'
-        if ( $timezone == 'Z' ) {
+        if ( 'Z' === $timezone ) {
                 $offset = 0;
         } else {
                 $sign    = ( substr( $timezone, 0, 1 ) == '+' ) ? 1 : -1;
@@ -3469 +3469 @@
 function iso8601_to_datetime( $date_string, $timezone = 'user' ) {
         $timezone = strtolower( $timezone );
 
-        if ( $timezone == 'gmt' ) {
+        if ( 'gmt' === $timezone ) {
 
                 preg_match( '#([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(Z|[\+|\-][0-9]{2,4}){0,1}#', $date_string, $date_bits );
 
@@ -3484 +3484 @@
 
                 return gmdate( 'Y-m-d H:i:s', $timestamp );
 
-        } elseif ( $timezone == 'user' ) {
+        } elseif ( 'user' === $timezone ) {
                 return preg_replace( '#([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(Z|[\+|\-][0-9]{2,4}){0,1}#', '$1-$2-$3 $4:$5:$6', $date_string );
         }
 }
@@ -3684 +3684 @@
  */
 function wp_trim_excerpt( $text = '' ) {
         $raw_excerpt = $text;
-        if ( '' == $text ) {
+        if ( '' === $text ) {
                 $text = get_the_content( '' );
 
                 $text = strip_shortcodes( $text );
@@ -4171 +4171 @@
 function esc_url( $url, $protocols = null, $_context = 'display' ) {
         $original_url = $url;
 
-        if ( '' == $url ) {
+        if ( '' === $url ) {
                 return $url;
         }
 
@@ -4198 +4198 @@
         }
 
         // Replace ampersands and single quotes only when displaying.
-        if ( 'display' == $_context ) {
+        if ( 'display' === $_context ) {
                 $url = wp_kses_normalize_entities( $url );
                 $url = str_replace( '&amp;', '&#038;', $url );
                 $url = str_replace( "'", '&#039;', $url );
@@ -4507 +4507 @@
                 case 'default_ping_status':
                 case 'default_comment_status':
                         // Options that if not there have 0 value but need to be something like "closed"
-                        if ( $value == '0' || $value == '' ) {
+                        if ( '0' === $value || '' === $value ) {
                                 $value = 'closed';
                         }
                         break;
@@ -4922 +4922 @@
         while ( $i ) {
                 $arg = array_shift( $args );
                 $i--;
-                if ( 0 == $i ) {
+                if ( 0 === $i ) {
                         $result .= $l['between_last_two'] . $arg;
                 } else {
                         $result .= $l['between'] . $arg;
@@ -5618 +5618 @@
                 $content = $textarr[ $i ];
 
                 // If we're in an ignore block, wait until we find its closing tag.
-                if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) ) {
+                if ( '' === $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) ) {
                         $ignore_block_element = $matches[1];
                 }
 
                 // If it's not a tag and not in ignore block.
-                if ( '' == $ignore_block_element && strlen( $content ) > 0 && '<' != $content[0] && false !== strpos( $content, '&#x' ) ) {
+                if ( '' === $ignore_block_element && strlen( $content ) > 0 && '<' != $content[0] && false !== strpos( $content, '&#x' ) ) {
                         foreach ( $possible_emoji as $emojum => $emoji_char ) {
                                 if ( false === strpos( $content, $emojum ) ) {
                                         continue;
@@ -5639 +5639 @@
                 }
 
                 // Did we exit ignore block.
-                if ( '' != $ignore_block_element && '</' . $ignore_block_element . '>' == $content ) {
+                if ( '' !== $ignore_block_element && '</' . $ignore_block_element . '>' == $content ) {
                         $ignore_block_element = '';
                 }