<!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>[53215] trunk/src/wp-admin/includes/plugin.php: Code Modernization: Rename parameters that use reserved keywords in `wp-admin/includes/plugin.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/53215">53215</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/53215","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 12:46:24 +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/plugin.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 `$function` parameter to `$callback` in:
* `add_menu_page()`
* `add_submenu_page()`
* `add_management_page()`
* `add_options_page()`
* `add_theme_page()`
* `add_plugins_page()`
* `add_users_page()`
* `add_dashboard_page()`
* `add_posts_page()`
* `add_media_page()`
* `add_links_page()`
* `add_pages_page()`
* `add_comments_page()`
* Renames the `$echo` parameter to `$display` in `menu_page_url()`.
* Renames the `$parent` parameter to `$parent_page` in `get_admin_page_parent()`.
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>.
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="#trunksrcwpadminincludespluginphp">trunk/src/wp-admin/includes/plugin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludespluginphp"></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/plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin.php 2022-04-19 12:37:53 UTC (rev 53214)
+++ trunk/src/wp-admin/includes/plugin.php 2022-04-19 12:46:24 UTC (rev 53215)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1292,7 +1292,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_slug The slug name to refer to this menu by. Should be unique for this menu page and only
</span><span class="cx" style="display: block; padding: 0 10px"> * include lowercase alphanumeric, dashes, and underscores characters to be compatible
</span><span class="cx" style="display: block; padding: 0 10px"> * with sanitize_key().
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param callable $function Optional. The function to be called to output the content for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param callable $callback Optional. The function to be called to output the content for this page.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $icon_url Optional. The URL to the icon to be used for this menu.
</span><span class="cx" style="display: block; padding: 0 10px"> * * Pass a base64-encoded SVG using a data URI, which will be colored to match
</span><span class="cx" style="display: block; padding: 0 10px"> * the color scheme. This should begin with 'data:image/svg+xml;base64,'.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1302,7 +1302,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|float $position Optional. The position in the menu order this item should appear.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The resulting page's hook_suffix.
</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 add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '', $position = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $callback = '', $icon_url = '', $position = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $menu, $admin_page_hooks, $_registered_pages, $_parent_pages;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_slug = plugin_basename( $menu_slug );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1311,8 +1311,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $hookname = get_plugin_page_hookname( $menu_slug, '' );
</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 ( ! empty( $function ) && ! empty( $hookname ) && current_user_can( $capability ) ) {
- add_action( $hookname, $function );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $callback ) && ! empty( $hookname ) && current_user_can( $capability ) ) {
+ add_action( $hookname, $callback );
</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 ( empty( $icon_url ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1371,20 +1371,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $_registered_pages
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $_parent_pages
</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 $parent_slug The slug name for the parent menu (or the file name of a standard
- * WordPress admin page).
- * @param string $page_title The text to be displayed in the title tags of the page when the menu
- * is selected.
- * @param string $menu_title The text to be used for the menu.
- * @param string $capability The capability required for this menu to be displayed to the user.
- * @param string $menu_slug The slug name to refer to this menu by. Should be unique for this menu
- * and only include lowercase alphanumeric, dashes, and underscores characters
- * to be compatible with sanitize_key().
- * @param callable $function Optional. The function to be called to output the content for this page.
- * @param int|float $position Optional. The position in the menu order this item should appear.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $parent_slug The slug name for the parent menu (or the file name of a standard
+ * WordPress admin page).
+ * @param string $page_title The text to be displayed in the title tags of the page when the menu
+ * is selected.
+ * @param string $menu_title The text to be used for the menu.
+ * @param string $capability The capability required for this menu to be displayed to the user.
+ * @param string $menu_slug The slug name to refer to this menu by. Should be unique for this menu
+ * and only include lowercase alphanumeric, dashes, and underscores characters
+ * to be compatible with sanitize_key().
+ * @param callable $callback Optional. The function to be called to output the content for this page.
+ * @param int|float $position Optional. The position in the menu order this item should appear.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string|false The resulting page's hook_suffix, or false if the user does not have the capability required.
</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 add_submenu_page( $parent_slug, $page_title, $menu_title, $capability, $menu_slug, $function = '', $position = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function add_submenu_page( $parent_slug, $page_title, $menu_title, $capability, $menu_slug, $callback = '', $position = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $submenu, $menu, $_wp_real_parent_file, $_wp_submenu_nopriv,
</span><span class="cx" style="display: block; padding: 0 10px"> $_registered_pages, $_parent_pages;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1456,8 +1456,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ksort( $submenu[ $parent_slug ] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $hookname = get_plugin_page_hookname( $menu_slug, $parent_slug );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $function ) && ! empty( $hookname ) ) {
- add_action( $hookname, $function );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $callback ) && ! empty( $hookname ) ) {
+ add_action( $hookname, $callback );
</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"> $_registered_pages[ $hookname ] = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1492,12 +1492,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_title The text to be used for the menu.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param callable $function Optional. The function to be called to output the content for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param callable $callback Optional. The function to be called to output the content for this page.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $position Optional. The position in the menu order this item should appear.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false The resulting page's hook_suffix, or false if the user does not have the capability required.
</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 add_management_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $position = null ) {
- return add_submenu_page( 'tools.php', $page_title, $menu_title, $capability, $menu_slug, $function, $position );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function add_management_page( $page_title, $menu_title, $capability, $menu_slug, $callback = '', $position = null ) {
+ return add_submenu_page( 'tools.php', $page_title, $menu_title, $capability, $menu_slug, $callback, $position );
</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">@@ -1516,12 +1516,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_title The text to be used for the menu.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param callable $function Optional. The function to be called to output the content for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param callable $callback Optional. The function to be called to output the content for this page.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $position Optional. The position in the menu order this item should appear.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false The resulting page's hook_suffix, or false if the user does not have the capability required.
</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 add_options_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $position = null ) {
- return add_submenu_page( 'options-general.php', $page_title, $menu_title, $capability, $menu_slug, $function, $position );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function add_options_page( $page_title, $menu_title, $capability, $menu_slug, $callback = '', $position = null ) {
+ return add_submenu_page( 'options-general.php', $page_title, $menu_title, $capability, $menu_slug, $callback, $position );
</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">@@ -1540,12 +1540,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_title The text to be used for the menu.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param callable $function Optional. The function to be called to output the content for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param callable $callback Optional. The function to be called to output the content for this page.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $position Optional. The position in the menu order this item should appear.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false The resulting page's hook_suffix, or false if the user does not have the capability required.
</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 add_theme_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $position = null ) {
- return add_submenu_page( 'themes.php', $page_title, $menu_title, $capability, $menu_slug, $function, $position );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function add_theme_page( $page_title, $menu_title, $capability, $menu_slug, $callback = '', $position = null ) {
+ return add_submenu_page( 'themes.php', $page_title, $menu_title, $capability, $menu_slug, $callback, $position );
</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">@@ -1564,12 +1564,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_title The text to be used for the menu.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param callable $function Optional. The function to be called to output the content for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param callable $callback Optional. The function to be called to output the content for this page.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $position Optional. The position in the menu order this item should appear.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false The resulting page's hook_suffix, or false if the user does not have the capability required.
</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 add_plugins_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $position = null ) {
- return add_submenu_page( 'plugins.php', $page_title, $menu_title, $capability, $menu_slug, $function, $position );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function add_plugins_page( $page_title, $menu_title, $capability, $menu_slug, $callback = '', $position = null ) {
+ return add_submenu_page( 'plugins.php', $page_title, $menu_title, $capability, $menu_slug, $callback, $position );
</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">@@ -1588,17 +1588,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_title The text to be used for the menu.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param callable $function Optional. The function to be called to output the content for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param callable $callback Optional. The function to be called to output the content for this page.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $position Optional. The position in the menu order this item should appear.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false The resulting page's hook_suffix, or false if the user does not have the capability required.
</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 add_users_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $position = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function add_users_page( $page_title, $menu_title, $capability, $menu_slug, $callback = '', $position = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'edit_users' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = 'users.php';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = 'profile.php';
</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 add_submenu_page( $parent, $page_title, $menu_title, $capability, $menu_slug, $function, $position );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return add_submenu_page( $parent, $page_title, $menu_title, $capability, $menu_slug, $callback, $position );
</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">@@ -1617,12 +1617,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_title The text to be used for the menu.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param callable $function Optional. The function to be called to output the content for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param callable $callback Optional. The function to be called to output the content for this page.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $position Optional. The position in the menu order this item should appear.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false The resulting page's hook_suffix, or false if the user does not have the capability required.
</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 add_dashboard_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $position = null ) {
- return add_submenu_page( 'index.php', $page_title, $menu_title, $capability, $menu_slug, $function, $position );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function add_dashboard_page( $page_title, $menu_title, $capability, $menu_slug, $callback = '', $position = null ) {
+ return add_submenu_page( 'index.php', $page_title, $menu_title, $capability, $menu_slug, $callback, $position );
</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">@@ -1641,12 +1641,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_title The text to be used for the menu.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param callable $function Optional. The function to be called to output the content for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param callable $callback Optional. The function to be called to output the content for this page.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $position Optional. The position in the menu order this item should appear.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false The resulting page's hook_suffix, or false if the user does not have the capability required.
</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 add_posts_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $position = null ) {
- return add_submenu_page( 'edit.php', $page_title, $menu_title, $capability, $menu_slug, $function, $position );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function add_posts_page( $page_title, $menu_title, $capability, $menu_slug, $callback = '', $position = null ) {
+ return add_submenu_page( 'edit.php', $page_title, $menu_title, $capability, $menu_slug, $callback, $position );
</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">@@ -1665,12 +1665,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_title The text to be used for the menu.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param callable $function Optional. The function to be called to output the content for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param callable $callback Optional. The function to be called to output the content for this page.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $position Optional. The position in the menu order this item should appear.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false The resulting page's hook_suffix, or false if the user does not have the capability required.
</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 add_media_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $position = null ) {
- return add_submenu_page( 'upload.php', $page_title, $menu_title, $capability, $menu_slug, $function, $position );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function add_media_page( $page_title, $menu_title, $capability, $menu_slug, $callback = '', $position = null ) {
+ return add_submenu_page( 'upload.php', $page_title, $menu_title, $capability, $menu_slug, $callback, $position );
</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">@@ -1689,12 +1689,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_title The text to be used for the menu.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param callable $function Optional. The function to be called to output the content for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param callable $callback Optional. The function to be called to output the content for this page.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $position Optional. The position in the menu order this item should appear.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false The resulting page's hook_suffix, or false if the user does not have the capability required.
</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 add_links_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $position = null ) {
- return add_submenu_page( 'link-manager.php', $page_title, $menu_title, $capability, $menu_slug, $function, $position );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function add_links_page( $page_title, $menu_title, $capability, $menu_slug, $callback = '', $position = null ) {
+ return add_submenu_page( 'link-manager.php', $page_title, $menu_title, $capability, $menu_slug, $callback, $position );
</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">@@ -1713,12 +1713,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_title The text to be used for the menu.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param callable $function Optional. The function to be called to output the content for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param callable $callback Optional. The function to be called to output the content for this page.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $position Optional. The position in the menu order this item should appear.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false The resulting page's hook_suffix, or false if the user does not have the capability required.
</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 add_pages_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $position = null ) {
- return add_submenu_page( 'edit.php?post_type=page', $page_title, $menu_title, $capability, $menu_slug, $function, $position );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function add_pages_page( $page_title, $menu_title, $capability, $menu_slug, $callback = '', $position = null ) {
+ return add_submenu_page( 'edit.php?post_type=page', $page_title, $menu_title, $capability, $menu_slug, $callback, $position );
</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">@@ -1737,12 +1737,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_title The text to be used for the menu.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param callable $function Optional. The function to be called to output the content for this page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param callable $callback Optional. The function to be called to output the content for this page.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $position Optional. The position in the menu order this item should appear.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false The resulting page's hook_suffix, or false if the user does not have the capability required.
</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 add_comments_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $position = null ) {
- return add_submenu_page( 'edit-comments.php', $page_title, $menu_title, $capability, $menu_slug, $function, $position );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function add_comments_page( $page_title, $menu_title, $capability, $menu_slug, $callback = '', $position = null ) {
+ return add_submenu_page( 'edit-comments.php', $page_title, $menu_title, $capability, $menu_slug, $callback, $position );
</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">@@ -1817,10 +1817,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $_parent_pages
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $echo Whether or not to echo the URL. Default true.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $display Optional. Whether or not to display the URL. Default true.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The menu page URL.
</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 menu_page_url( $menu_slug, $echo = true ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function menu_page_url( $menu_slug, $display = true ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $_parent_pages;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_parent_pages[ $menu_slug ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1837,7 +1837,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url = esc_url( $url );
</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 $url;
</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">@@ -1862,20 +1862,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $_wp_menu_nopriv
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $_wp_submenu_nopriv
</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 $parent The slug name for the parent menu (or the file name of a standard
- * WordPress admin page). Default empty string.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $parent_page Optional. The slug name for the parent menu (or the file name
+ * of a standard WordPress admin page). Default empty string.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The parent file of the current admin page.
</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 get_admin_page_parent( $parent = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_admin_page_parent( $parent_page = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $parent_file, $menu, $submenu, $pagenow, $typenow,
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_page, $_wp_real_parent_file, $_wp_menu_nopriv, $_wp_submenu_nopriv;
</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 ( ! empty( $parent ) && 'admin.php' !== $parent ) {
- if ( isset( $_wp_real_parent_file[ $parent ] ) ) {
- $parent = $_wp_real_parent_file[ $parent ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $parent_page ) && 'admin.php' !== $parent_page ) {
+ if ( isset( $_wp_real_parent_file[ $parent_page ] ) ) {
+ $parent_page = $_wp_real_parent_file[ $parent_page ];
</ins><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 $parent;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $parent_page;
</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 ( 'admin.php' === $pagenow && isset( $plugin_page ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1911,23 +1911,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $parent_file;
</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">- foreach ( array_keys( (array) $submenu ) as $parent ) {
- foreach ( $submenu[ $parent ] as $submenu_array ) {
- if ( isset( $_wp_real_parent_file[ $parent ] ) ) {
- $parent = $_wp_real_parent_file[ $parent ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( array_keys( (array) $submenu ) as $parent_page ) {
+ foreach ( $submenu[ $parent_page ] as $submenu_array ) {
+ if ( isset( $_wp_real_parent_file[ $parent_page ] ) ) {
+ $parent_page = $_wp_real_parent_file[ $parent_page ];
</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 ( ! empty( $typenow ) && "$pagenow?post_type=$typenow" === $submenu_array[2] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_file = $parent;
- return $parent;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_file = $parent_page;
+ return $parent_page;
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( empty( $typenow ) && $pagenow === $submenu_array[2]
</span><span class="cx" style="display: block; padding: 0 10px"> && ( empty( $parent_file ) || false === strpos( $parent_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">- $parent_file = $parent;
- return $parent;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_file = $parent_page;
+ return $parent_page;
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $plugin_page ) && $plugin_page === $submenu_array[2] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_file = $parent;
- return $parent;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_file = $parent_page;
+ return $parent_page;
</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>
</div>
</body>
</html>