<!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>[47775] trunk/src/wp-admin/includes/template.php: Coding Standards: Fix WPCS issues in `wp-admin/includes/template.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/47775">47775</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/47775","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>2020-05-08 16:34:50 +0000 (Fri, 08 May 2020)</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: Fix WPCS issues in `wp-admin/includes/template.php`.
See <a href="https://core.trac.wordpress.org/ticket/49542">#49542</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/template.php 2020-05-08 08:34:21 UTC (rev 47774)
+++ trunk/src/wp-admin/includes/template.php 2020-05-08 16:34:50 UTC (rev 47775)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -691,13 +691,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $limit Number of custom fields to retrieve. Default 30.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $limit = apply_filters( 'postmeta_form_limit', 30 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sql = "SELECT DISTINCT meta_key
- FROM $wpdb->postmeta
- WHERE meta_key NOT BETWEEN '_' AND '_z'
- HAVING meta_key NOT LIKE %s
- ORDER BY meta_key
- LIMIT %d";
- $keys = $wpdb->get_col( $wpdb->prepare( $sql, $wpdb->esc_like( '_' ) . '%', $limit ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $keys = $wpdb->get_col(
+ $wpdb->prepare(
+ "SELECT DISTINCT meta_key
+ FROM $wpdb->postmeta
+ WHERE meta_key NOT BETWEEN '_' AND '_z'
+ HAVING meta_key NOT LIKE %s
+ ORDER BY meta_key
+ LIMIT %d",
+ $wpdb->esc_like( '_' ) . '%',
+ $limit
+ )
+ );
</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"> if ( $keys ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -784,7 +790,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $for_post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $edit = ! ( in_array( $post->post_status, array( 'draft', 'pending' ), true ) && ( ! $post->post_date_gmt || '0000-00-00 00:00:00' == $post->post_date_gmt ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $edit = ! ( in_array( $post->post_status, array( 'draft', 'pending' ), true ) && ( ! $post->post_date_gmt || '0000-00-00 00:00:00' === $post->post_date_gmt ) );
</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"> $tab_index_attribute = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -896,6 +902,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function parent_dropdown( $default = 0, $parent = 0, $level = 0, $post = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $items = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' ORDER BY menu_order", $parent ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -902,7 +909,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $items ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $items as $item ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // A page cannot be its own parent.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $post && $post->ID && $item->ID == $post->ID ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $post && $post->ID && (int) $item->ID === $post->ID ) {
</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">@@ -932,7 +939,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $editable_roles as $role => $details ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $name = translate_user_role( $details['name'] );
</span><span class="cx" style="display: block; padding: 0 10px"> // Preselect specified role.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $selected == $role ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $selected === $role ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $r .= "\n\t<option selected='selected' value='" . esc_attr( $role ) . "'>$name</option>";
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $r .= "\n\t<option value='" . esc_attr( $role ) . "'>$name</option>";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1057,7 +1064,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"> // If a core box was previously added or removed by a plugin, don't add.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'core' == $priority ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'core' === $priority ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // If core box previously deleted, don't add.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $wp_meta_boxes[ $page ][ $a_context ][ $a_priority ][ $id ] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1067,7 +1074,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * If box was added with default priority, give it core priority to
</span><span class="cx" style="display: block; padding: 0 10px"> * maintain sort order.
</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 ( 'default' == $a_priority ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'default' === $a_priority ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_meta_boxes[ $page ][ $a_context ]['core'][ $id ] = $wp_meta_boxes[ $page ][ $a_context ]['default'][ $id ];
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $wp_meta_boxes[ $page ][ $a_context ]['default'][ $id ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1080,13 +1087,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Else, if we're adding to the sorted priority, we don't know the title
</span><span class="cx" style="display: block; padding: 0 10px"> * or callback. Grab them from the previously added context/priority.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'sorted' == $priority ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'sorted' === $priority ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = $wp_meta_boxes[ $page ][ $a_context ][ $a_priority ][ $id ]['title'];
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = $wp_meta_boxes[ $page ][ $a_context ][ $a_priority ][ $id ]['callback'];
</span><span class="cx" style="display: block; padding: 0 10px"> $callback_args = $wp_meta_boxes[ $page ][ $a_context ][ $a_priority ][ $id ]['args'];
</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"> // An ID can be in only one priority and one context.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $priority != $a_priority || $context != $a_context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $priority !== $a_priority || $context !== $a_context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $wp_meta_boxes[ $page ][ $a_context ][ $a_priority ][ $id ] );
</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">@@ -1227,15 +1235,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @staticvar bool $already_sorted
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string|WP_Screen $screen Screen identifier. If you have used add_menu_page() or
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string|WP_Screen $screen The screen identifier. If you have used add_menu_page() or
</ins><span class="cx" style="display: block; padding: 0 10px"> * add_submenu_page() to create a new screen (and hence screen_id)
</span><span class="cx" style="display: block; padding: 0 10px"> * make sure your menu slug conforms to the limits of sanitize_key()
</span><span class="cx" style="display: block; padding: 0 10px"> * otherwise the 'screen' menu may not correctly render on your page.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $context The screen context for which to display meta boxes.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param mixed $object Gets passed to the first parameter of the meta box callback function.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param mixed $object Gets passed to the meta box callback function as the first parameter.
</ins><span class="cx" style="display: block; padding: 0 10px"> * Often this is the object that's the focus of the current screen, for
</span><span class="cx" style="display: block; padding: 0 10px"> * example a `WP_Post` or `WP_Comment` object.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return int number of meta_boxes
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return int Number of meta_boxes.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function do_meta_boxes( $screen, $context, $object ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_meta_boxes;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1275,7 +1283,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'high', 'sorted', 'core', 'default', 'low' ) as $priority ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false == $box || ! $box['title'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === $box || ! $box['title'] ) {
</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">@@ -1307,7 +1315,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // get_hidden_meta_boxes() doesn't apply in the block editor.
</span><span class="cx" style="display: block; padding: 0 10px"> $hidden_class = ( ! $screen->is_block_editor() && in_array( $box['id'], $hidden, true ) ) ? ' hide-if-js' : '';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes( $box['id'], $page ) . $hidden_class . '" ' . '>' . "\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'dashboard_browser_nag' != $box['id'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'dashboard_browser_nag' !== $box['id'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget_title = $box['title'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $box['args'] ) && isset( $box['args']['__widget_basename'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1428,9 +1436,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses global $wp_meta_boxes Used to retrieve registered meta boxes.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|object $screen The screen identifier.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $context The meta box context.
- * @param mixed $object gets passed to the section callback function as first parameter.
- * @return int number of meta boxes as accordion sections.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $context The screen context for which to display accordion sections.
+ * @param mixed $object Gets passed to the section callback function as the first parameter.
+ * @return int Number of meta boxes as accordion sections.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function do_accordion_sections( $screen, $context, $object ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_meta_boxes;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1457,9 +1465,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false == $box || ! $box['title'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === $box || ! $box['title'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</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"> $i++;
</span><span class="cx" style="display: block; padding: 0 10px"> $hidden_class = in_array( $box['id'], $hidden, true ) ? 'hide-if-js' : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1517,7 +1526,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function add_settings_section( $id, $title, $callback, $page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_settings_sections;
</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 ( 'misc' == $page ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'misc' === $page ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '3.0.0',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1530,7 +1539,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $page = 'general';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 ( 'privacy' == $page ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'privacy' === $page ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '3.5.0',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1588,7 +1597,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function add_settings_field( $id, $title, $callback, $page, $section = 'default', $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_settings_fields;
</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 ( 'misc' == $page ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'misc' === $page ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '3.0.0',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1601,7 +1610,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $page = 'general';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 ( 'privacy' == $page ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'privacy' === $page ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '3.5.0',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1790,7 +1799,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $setting_errors = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $wp_settings_errors as $key => $details ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $setting == $details['setting'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $setting === $details['setting'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $setting_errors[] = $wp_settings_errors[ $key ];
</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">@@ -2098,9 +2107,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_states_string .= ' — ';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $post_states as $state ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ++$i;
- ( $i == $state_count ) ? $sep = '' : $sep = ', ';
- $post_states_string .= "<span class='post-state'>$state$sep</span>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sep = ( ++$i === $state_count ) ? '' : ', ';
+
+ $post_states_string .= "<span class='post-state'>$state$sep</span>";
</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">@@ -2131,7 +2140,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_states['protected'] = _x( 'Password protected', 'post status' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 ( 'private' == $post->post_status && 'private' != $post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'private' === $post->post_status && 'private' !== $post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_states['private'] = _x( 'Private', 'post status' );
</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">@@ -2145,7 +2154,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_states[] = _x( 'Customization Draft', 'post status' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 ( 'pending' == $post->post_status && 'pending' != $post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'pending' === $post->post_status && 'pending' !== $post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_states['pending'] = _x( 'Pending', 'post status' );
</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">@@ -2201,7 +2210,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_random_header_image() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $header_images = wp_list_pluck( get_uploaded_header_images(), 'attachment_id' );
</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 ( $meta_header == $stylesheet && in_array( $post->ID, $header_images, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $meta_header === $stylesheet && in_array( $post->ID, $header_images, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $media_states[] = __( 'Header Image' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2232,11 +2241,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_option( 'site_icon' ) == $post->ID ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( (int) get_option( 'site_icon' ) === $post->ID ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $media_states[] = __( 'Site Icon' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 ( get_theme_mod( 'custom_logo' ) == $post->ID ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( (int) get_theme_mod( 'custom_logo' ) === $post->ID ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $media_states[] = __( 'Logo' );
</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">@@ -2259,8 +2268,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo ' — ';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $media_states as $state ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ++$i;
- ( $i == $state_count ) ? $sep = '' : $sep = ', ';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sep = ( ++$i === $state_count ) ? '' : ', ';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "<span class='post-state'>$state$sep</span>";
</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>