<!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>[53220] trunk/src/wp-admin/includes: Code Modernization: Rename parameters that use reserved keywords 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/53220">53220</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/53220","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>2022-04-19 15:11:22 +0000 (Tue, 19 Apr 2022)</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'>Code Modernization: Rename parameters that use reserved keywords in `wp-admin/includes/template.php`.
While using reserved PHP keywords as parameter name labels is allowed, in the context of function calls using named parameters in PHP 8.0+, this will easily lead to confusion. To avoid that, it is recommended not to use reserved keywords as function parameter names.
This commit:
* Renames the `$echo` parameter to `$display` in:
* `wp_popular_terms_checklist()`
* `_post_states()`
* `_media_states()`
* Renames the `$default` parameter to `$default_term` in `wp_popular_terms_checklist()`.
* Renames the `$default` parameter to `$default_template` in `page_template_dropdown()`.
* Renames the `$default` parameter to `$default_page` in `parent_dropdown()`.
* Renames the `$object` parameter to `$data_object` in:
* `do_block_editor_incompatible_meta_box()`
* `do_meta_boxes()`
* `do_accordion_sections()`
* Amends the `$item_object` parameter in other functions for consistency:
* `wp_nav_menu_item_post_type_meta_box()`
* `wp_nav_menu_item_taxonomy_meta_box()`
* `_wp_nav_menu_meta_box_object()`
Follow-up to <a href="https://core.trac.wordpress.org/changeset/52946">[52946]</a>, <a href="https://core.trac.wordpress.org/changeset/52996">[52996]</a>, <a href="https://core.trac.wordpress.org/changeset/52997">[52997]</a>, <a href="https://core.trac.wordpress.org/changeset/52998">[52998]</a>, <a href="https://core.trac.wordpress.org/changeset/53003">[53003]</a>, <a href="https://core.trac.wordpress.org/changeset/53014">[53014]</a>, <a href="https://core.trac.wordpress.org/changeset/53029">[53029]</a>, <a href="https://core.trac.wordpress.org/changeset/53039">[53039]</a>, <a href="https://core.trac.wordpress.org/changeset/53116">[53116]</a>, <a href="https://core.trac.wordpress.org/changeset/53117">[53117]</a>, <a href="https://core.trac.wordpress.org/changeset/53137">[53137]</a>, <a href="https://core.trac.wordpress.org/changeset/53174">[53174]</a>, <a href="https://core.trac.wordpress.org/changeset/53184">[53184]</a>, <a href="https://core.trac.wordpress.org/changeset/53185">[531
85]</a>, <a href="https://core.trac.wordpress.org/changeset/53192">[53192]</a>, <a href="https://core.trac.wordpress.org/changeset/53193">[53193]</a>, <a href="https://core.trac.wordpress.org/changeset/53198">[53198]</a>, <a href="https://core.trac.wordpress.org/changeset/53203">[53203]</a>, <a href="https://core.trac.wordpress.org/changeset/53207">[53207]</a>, <a href="https://core.trac.wordpress.org/changeset/53215">[53215]</a>, <a href="https://core.trac.wordpress.org/changeset/53216">[53216]</a>.
Props jrf, aristath, poena, justinahinon, SergeyBiryukov.
See <a href="https://core.trac.wordpress.org/ticket/55327">#55327</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesnavmenuphp">trunk/src/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesnavmenuphp"></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/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/nav-menu.php 2022-04-19 15:08:48 UTC (rev 53219)
+++ trunk/src/wp-admin/includes/nav-menu.php 2022-04-19 15:11:22 UTC (rev 53220)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -325,7 +325,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int $_nav_menu_placeholder
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int|string $nav_menu_selected_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">- * @param string $item_object Not used.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $data_object Not used.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $box {
</span><span class="cx" style="display: block; padding: 0 10px"> * Post type menu item meta box arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,7 +335,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type WP_Post_Type $args Extra meta box arguments (the post type object for this meta box).
</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">-function wp_nav_menu_item_post_type_meta_box( $item_object, $box ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_nav_menu_item_post_type_meta_box( $data_object, $box ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $_nav_menu_placeholder, $nav_menu_selected_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_name = $box['args']->name;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -689,7 +689,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int|string $nav_menu_selected_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">- * @param string $item_object Not used.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $data_object Not used.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $box {
</span><span class="cx" style="display: block; padding: 0 10px"> * Taxonomy menu item meta box arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -699,7 +699,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type object $args Extra meta box arguments (the taxonomy object for this meta box).
</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">-function wp_nav_menu_item_taxonomy_meta_box( $item_object, $box ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_nav_menu_item_taxonomy_meta_box( $data_object, $box ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $nav_menu_selected_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy_name = $box['args']->name;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -989,27 +989,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</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 object $item_object The post type or taxonomy meta-object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param object $data_object The post type or taxonomy meta-object.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return object The post type or taxonomy object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_nav_menu_meta_box_object( $item_object = null ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $item_object->name ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $data_object->name ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'page' === $item_object->name ) {
- $item_object->_default_query = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === $data_object->name ) {
+ $data_object->_default_query = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'menu_order title',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</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"> // Posts should show only published items.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'post' === $item_object->name ) {
- $item_object->_default_query = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'post' === $data_object->name ) {
+ $data_object->_default_query = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</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"> // Categories should be in reverse chronological order.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'category' === $item_object->name ) {
- $item_object->_default_query = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'category' === $data_object->name ) {
+ $data_object->_default_query = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'id',
</span><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'DESC',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1016,13 +1016,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Custom post types should show only published items.
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $item_object->_default_query = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data_object->_default_query = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</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><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $item_object;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $data_object;
</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></pre></div>
<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 2022-04-19 15:08:48 UTC (rev 53219)
+++ trunk/src/wp-admin/includes/template.php 2022-04-19 15:11:22 UTC (rev 53220)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,20 +193,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Retrieves a list of the most popular terms from the specified taxonomy.
</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 the $echo argument is true then the elements for a list of checkbox
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * If the `$display` argument is true then the elements for a list of checkbox
</ins><span class="cx" style="display: block; padding: 0 10px"> * `<input>` elements labelled with the names of the selected terms is output.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * If the $post_ID global is not empty then the terms associated with that
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * If the `$post_ID` global is not empty then the terms associated with that
</ins><span class="cx" style="display: block; padding: 0 10px"> * post will be marked as checked.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</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 $taxonomy Taxonomy to retrieve terms from.
- * @param int $default Not used.
- * @param int $number Number of terms to retrieve. Defaults to 10.
- * @param bool $echo Optionally output the list as well. Defaults to true.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $taxonomy Taxonomy to retrieve terms from.
+ * @param int $default_term Optional. Not used.
+ * @param int $number Optional. Number of terms to retrieve. Default 10.
+ * @param bool $display Optional. Whether to display the list as well. Default true.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return int[] Array of popular term IDs.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10, $echo = true ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_popular_terms_checklist( $taxonomy, $default_term = 0, $number = 10, $display = true ) {
</ins><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 ( $post && $post->ID ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,9 +231,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $terms as $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $popular_ids[] = $term->term_id;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $echo ) { // Hack for Ajax use.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( ! $display ) { // Hack for Ajax use.
</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"> $id = "popular-$taxonomy-$term->term_id";
</span><span class="cx" style="display: block; padding: 0 10px"> $checked = in_array( $term->term_id, $checked_terms, true ) ? 'checked="checked"' : '';
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -874,16 +876,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0 Added the `$post_type` parameter.
</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 $default Optional. The template file name. Default empty.
- * @param string $post_type Optional. Post type to get templates for. Default 'post'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $default_template Optional. The template file name. Default empty.
+ * @param string $post_type Optional. Post type to get templates for. Default 'post'.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function page_template_dropdown( $default = '', $post_type = 'page' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function page_template_dropdown( $default_template = '', $post_type = 'page' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $templates = get_page_templates( null, $post_type );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ksort( $templates );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_keys( $templates ) as $template ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $selected = selected( $default, $templates[ $template ], false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $selected = selected( $default_template, $templates[ $template ], false );
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "\n\t<option value='" . esc_attr( $templates[ $template ] ) . "' $selected>" . esc_html( $template ) . '</option>';
</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">@@ -896,13 +898,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</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 int $default Optional. The default page ID to be pre-selected. Default 0.
- * @param int $parent Optional. The parent page ID. Default 0.
- * @param int $level Optional. Page depth level. Default 0.
- * @param int|WP_Post $post Post ID or WP_Post object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $default_page Optional. The default page ID to be pre-selected. Default 0.
+ * @param int $parent Optional. The parent page ID. Default 0.
+ * @param int $level Optional. Page depth level. Default 0.
+ * @param int|WP_Post $post Post ID or WP_Post object.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return void|false Void on success, false if the page has no children.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function parent_dropdown( $default = 0, $parent = 0, $level = 0, $post = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function parent_dropdown( $default_page = 0, $parent = 0, $level = 0, $post = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -916,10 +918,10 @@
</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"> $pad = str_repeat( ' ', $level * 3 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $selected = selected( $default, $item->ID, false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $selected = selected( $default_page, $item->ID, false );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo "\n\t<option class='level-$level' value='$item->ID' $selected>$pad " . esc_html( $item->post_title ) . '</option>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- parent_dropdown( $default, $item->ID, $level + 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ parent_dropdown( $default_page, $item->ID, $level + 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1128,8 +1130,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.0.0
</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 mixed $object The data object being rendered on this screen.
- * @param array $box {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param mixed $data_object The data object being rendered on this screen.
+ * @param array $box {
</ins><span class="cx" style="display: block; padding: 0 10px"> * Custom formats meta box arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $id Meta box 'id' attribute.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1138,7 +1140,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type array $args Extra meta box arguments.
</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">-function do_block_editor_incompatible_meta_box( $object, $box ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function do_block_editor_incompatible_meta_box( $data_object, $box ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugin = _get_plugin_from_callback( $box['old_callback'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $plugins = get_plugins();
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1174,13 +1176,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Please activate the <a href="%s">Classic Editor plugin</a> to use this meta box.' ), esc_url( $activate_url ) );
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</p>';
</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 ( $object instanceof WP_Post ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $data_object instanceof WP_Post ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $edit_url = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'classic-editor' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'classic-editor__forget' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_edit_post_link( $object )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_edit_post_link( $data_object )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p>';
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: A link to use the Classic Editor plugin. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1244,17 +1246,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $wp_meta_boxes
</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 The screen identifier. If you have used add_menu_page() or
- * add_submenu_page() to create a new screen (and hence screen_id)
- * make sure your menu slug conforms to the limits of sanitize_key()
- * otherwise the 'screen' menu may not correctly render on your page.
- * @param string $context The screen context for which to display meta boxes.
- * @param mixed $object Gets passed to the meta box callback function as the first parameter.
- * Often this is the object that's the focus of the current screen, for
- * example a `WP_Post` or `WP_Comment` object.
</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
+ * add_submenu_page() to create a new screen (and hence screen_id)
+ * make sure your menu slug conforms to the limits of sanitize_key()
+ * otherwise the 'screen' menu may not correctly render on your page.
+ * @param string $context The screen context for which to display meta boxes.
+ * @param mixed $data_object Gets passed to the meta box callback function as the first parameter.
+ * Often this is the object that's the focus of the current screen,
+ * for example a `WP_Post` or `WP_Comment` object.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return int Number of meta_boxes.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function do_meta_boxes( $screen, $context, $object ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function do_meta_boxes( $screen, $context, $data_object ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_meta_boxes;
</span><span class="cx" style="display: block; padding: 0 10px"> static $already_sorted = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1396,7 +1398,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- call_user_func( $box['callback'], $object, $box );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ call_user_func( $box['callback'], $data_object, $box );
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "</div>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> echo "</div>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1473,12 +1475,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string|object $screen The screen identifier.
- * @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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string|object $screen The screen identifier.
+ * @param string $context The screen context for which to display accordion sections.
+ * @param mixed $data_object Gets passed to the section callback function as the first parameter.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return int Number of meta boxes as accordion 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">-function do_accordion_sections( $screen, $context, $object ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function do_accordion_sections( $screen, $context, $data_object ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_meta_boxes;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'accordion' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1523,7 +1525,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </h3>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="accordion-section-content <?php postbox_classes( $box['id'], $page ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="inside">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php call_user_func( $box['callback'], $object, $box ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php call_user_func( $box['callback'], $data_object, $box ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .inside -->
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .accordion-section-content -->
</span><span class="cx" style="display: block; padding: 0 10px"> </li><!-- .accordion-section -->
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2135,15 +2137,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Echoes or returns the post states as HTML.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 5.3.0 Added the `$echo` parameter and a return value.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.3.0 Added the `$display` parameter and a return value.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see get_post_states()
</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 WP_Post $post The post to retrieve states for.
- * @param bool $echo Optional. Whether to echo the post states as an HTML string. Default true.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Post $post The post to retrieve states for.
+ * @param bool $display Optional. Whether to display the post states as an HTML string.
+ * Default true.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string Post states string.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _post_states( $post, $echo = true ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _post_states( $post, $display = true ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_states = get_post_states( $post );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -2163,7 +2166,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $echo ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $display ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo $post_states_string;
</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">@@ -2250,13 +2253,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Outputs the attachment media states as HTML.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.2.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 5.6.0 Added the `$echo` parameter and a return value.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.6.0 Added the `$display` parameter and a return value.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param WP_Post $post The attachment post to retrieve states for.
- * @param bool $echo Optional. Whether to echo the post states as an HTML string. Default true.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Post $post The attachment post to retrieve states for.
+ * @param bool $display Optional. Whether to display the post states as an HTML string.
+ * Default true.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string Media states string.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _media_states( $post, $echo = true ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _media_states( $post, $display = true ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $media_states = get_media_states( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $media_states_string = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2276,7 +2280,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $echo ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $display ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo $media_states_string;
</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>