<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[56326] trunk/src/wp-includes/functions.php: Coding Standards: Use strict comparison in `wp-includes/functions.php`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/56326">56326</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/56326","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-07-31 13:31:28 +0000 (Mon, 31 Jul 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Coding Standards: Use strict comparison in `wp-includes/functions.php`.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/5999">[5999]</a>, <a href="https://core.trac.wordpress.org/changeset/6342">[6342]</a>, <a href="https://core.trac.wordpress.org/changeset/7406">[7406]</a>, <a href="https://core.trac.wordpress.org/changeset/8369">[8369]</a>, <a href="https://core.trac.wordpress.org/changeset/10322">[10322]</a>, <a href="https://core.trac.wordpress.org/changeset/11288">[11288]</a>, <a href="https://core.trac.wordpress.org/changeset/11332">[11332]</a>, <a href="https://core.trac.wordpress.org/changeset/11597">[11597]</a>, <a href="https://core.trac.wordpress.org/changeset/12405">[12405]</a>, <a href="https://core.trac.wordpress.org/changeset/13569">[13569]</a>, <a href="https://core.trac.wordpress.org/changeset/14649">[14649]</a>, <a href="https://core.trac.wordpress.org/changeset/15806">[15806]</a>, <a href="https://core.trac.wordpress.org/changeset/19773">[19773]</a>, <a href="https://core.trac.wordpress.org/changeset/26449">[26449]</a>,
<a href="https://core.trac.wordpress.org/changeset/26926">[26926]</a>, <a href="https://core.trac.wordpress.org/changeset/39831">[39831]</a>, <a href="https://core.trac.wordpress.org/changeset/40124">[40124]</a>.
Props aristath, poena, afercia, SergeyBiryukov.
See <a href="https://core.trac.wordpress.org/ticket/58831">#58831</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2023-07-30 08:51:37 UTC (rev 56325)
+++ trunk/src/wp-includes/functions.php 2023-07-31 13:31:28 UTC (rev 56326)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1061,12 +1061,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $urlencode ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $k = urlencode( $k );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_int( $k ) && null != $prefix ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( is_int( $k ) && null !== $prefix ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $k = $prefix . $k;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $key ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $k = $key . '%5B' . $k . '%5D';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( null === $v ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( false === $v ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1772,9 +1775,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $suppress = $wpdb->suppress_errors();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_installing() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $alloptions = wp_load_alloptions();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If siteurl is not set to autoload, check it specifically.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $alloptions['siteurl'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1781,6 +1786,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $installed = $alloptions['siteurl'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->suppress_errors( $suppress );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $installed = ! empty( $installed );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1805,10 +1811,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_tables = $wpdb->tables();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wp_tables as $table ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // The existence of custom user tables shouldn't suggest an unwise state or prevent a clean installation.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE === $table ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE === $table ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2080,7 +2087,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * If a umask is set that modifies $dir_perms, we'll have to re-set
</span><span class="cx" style="display: block; padding: 0 10px"> * the $dir_perms correctly with chmod()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( $dir_perms & ~umask() ) != $dir_perms ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( $dir_perms & ~umask() ) !== $dir_perms ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $folder_parts = explode( '/', substr( $target, strlen( $target_parent ) + 1 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 1, $c = count( $folder_parts ); $i <= $c; $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> chmod( $target_parent . '/' . implode( '/', array_slice( $folder_parts, 0, $i ) ), $dir_perms );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2430,7 +2437,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_option( 'upload_url_path' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $upload_path ) || ( 'wp-content/uploads' === $upload_path ) || ( $upload_path == $dir ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $upload_path ) || ( 'wp-content/uploads' === $upload_path ) || ( $upload_path === $dir ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = WP_CONTENT_URL . '/uploads';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = trailingslashit( $siteurl ) . $upload_path;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3095,7 +3102,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Attempt to figure out what type of image it actually is.
</span><span class="cx" style="display: block; padding: 0 10px"> $real_mime = wp_get_image_mime( $file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $real_mime && $real_mime != $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $real_mime && $real_mime !== $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the list mapping image mime types to their respective extensions.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3122,9 +3129,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $filename_parts[] = $mime_to_ext[ $real_mime ];
</span><span class="cx" style="display: block; padding: 0 10px"> $new_filename = implode( '.', $filename_parts );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $new_filename != $filename ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $new_filename !== $filename ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $proper_filename = $new_filename; // Mark that it changed.
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Redefine the extension / MIME.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_filetype = wp_check_filetype( $new_filename, $mimes );
</span><span class="cx" style="display: block; padding: 0 10px"> $ext = $wp_filetype['ext'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4787,16 +4795,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $rest = substr( $smiley, 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // New subpattern?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $firstchar != $subchar ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $firstchar !== $subchar ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $subchar ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_smiliessearch .= ')(?=' . $spaces . '|$)'; // End previous "subpattern".
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_smiliessearch .= '|(?<=' . $spaces . '|^)'; // Begin another "subpattern".
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $subchar = $firstchar;
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_smiliessearch .= preg_quote( $firstchar, '/' ) . '(?:';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_smiliessearch .= '|';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_smiliessearch .= preg_quote( $rest, '/' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5938,7 +5948,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $server_parts = explode( '/', isset( $_SERVER['SERVER_SOFTWARE'] ) ? $_SERVER['SERVER_SOFTWARE'] : '' );
</span><span class="cx" style="display: block; padding: 0 10px"> $server_parts[1] = isset( $server_parts[1] ) ? $server_parts[1] : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return ( 'lighttpd' === $server_parts[0] && -1 == version_compare( $server_parts[1], '1.5.0' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return ( 'lighttpd' === $server_parts[0] && -1 === version_compare( $server_parts[1], '1.5.0' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6347,6 +6357,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $timezone_object || false === $datetime_object ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return round( timezone_offset_get( $timezone_object, $datetime_object ) / HOUR_IN_SECONDS, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6367,24 +6378,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( str_starts_with( $a['city'], 'GMT+' ) && str_starts_with( $b['city'], 'GMT+' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return -1 * ( strnatcasecmp( $a['city'], $b['city'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'UTC' === $a['city'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( str_starts_with( $b['city'], 'GMT+' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return -1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'UTC' === $b['city'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( str_starts_with( $a['city'], 'GMT+' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return -1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return strnatcasecmp( $a['city'], $b['city'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $a['t_continent'] == $b['t_continent'] ) {
- if ( $a['t_city'] == $b['t_city'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( $a['t_continent'] === $b['t_continent'] ) {
+ if ( $a['t_city'] === $b['t_city'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return strnatcasecmp( $a['t_subcity'], $b['t_subcity'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return strnatcasecmp( $a['t_city'], $b['t_city'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // Force Etc to the bottom of the list.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6391,9 +6409,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'Etc' === $a['continent'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'Etc' === $b['continent'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return -1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return strnatcasecmp( $a['t_continent'], $b['t_continent'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6913,7 +6933,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Tortoise got lapped - must be a loop.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $tortoise == $evanescent_hare || $tortoise == $hare ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $tortoise === $evanescent_hare || $tortoise === $hare ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $_return_loop ? $return : $tortoise;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7010,7 +7030,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $skip_frames > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $skip_frames--;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $call['class'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $check_class && $ignore_class == $call['class'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $check_class && $ignore_class === $call['class'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue; // Filter out calls.
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>