<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#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>
<title>[11856] trunk/wp-admin/includes/plugin.php: Make add_object_page()
and add_utility_page() use add_menu_page() rather than duplicated code.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11856">11856</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-08-20 21:00:52 +0000 (Thu, 20 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make add_object_page() and add_utility_page() use add_menu_page() rather than duplicated code. Fixes <a href="http://trac.wordpress.org/ticket/9942">#9942</a> props scribu.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludespluginphp">trunk/wp-admin/includes/plugin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (11855 => 11856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2009-08-20 20:58:44 UTC (rev 11855)
+++ trunk/wp-admin/includes/plugin.php 2009-08-20 21:00:52 UTC (rev 11856)
</span><span class="lines">@@ -584,7 +584,7 @@
</span><span class="cx"> // Menu
</span><span class="cx"> //
</span><span class="cx">
</span><del>-function add_menu_page( $page_title, $menu_title, $access_level, $file, $function = '', $icon_url = '' ) {
</del><ins>+function add_menu_page( $page_title, $menu_title, $access_level, $file, $function = '', $icon_url = '', $position = NULL ) {
</ins><span class="cx"> global $menu, $admin_page_hooks, $_registered_pages;
</span><span class="cx">
</span><span class="cx"> $file = plugin_basename( $file );
</span><span class="lines">@@ -595,66 +595,39 @@
</span><span class="cx"> if (!empty ( $function ) && !empty ( $hookname ))
</span><span class="cx"> add_action( $hookname, $function );
</span><span class="cx">
</span><del>- if ( empty($icon_url) )
</del><ins>+ if ( empty($icon_url) ) {
</ins><span class="cx"> $icon_url = 'images/generic.png';
</span><del>- elseif ( is_ssl() && 0 === strpos($icon_url, 'http://') )
</del><ins>+ } elseif ( is_ssl() && 0 === strpos($icon_url, 'http://') ) {
</ins><span class="cx"> $icon_url = 'https://' . substr($icon_url, 7);
</span><ins>+ }
</ins><span class="cx">
</span><del>- $menu[] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
</del><ins>+ $new_menu = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
</ins><span class="cx">
</span><ins>+ if ( NULL === $position ) {
+ $menu[] = $new_menu;
+ } else {
+ $menu[$position] = $new_menu;
+ }
+
</ins><span class="cx"> $_registered_pages[$hookname] = true;
</span><span class="cx">
</span><span class="cx"> return $hookname;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function add_object_page( $page_title, $menu_title, $access_level, $file, $function = '', $icon_url = '') {
</span><del>- global $menu, $admin_page_hooks, $_wp_last_object_menu, $_registered_pages;
-
- $file = plugin_basename( $file );
-
- $admin_page_hooks[$file] = sanitize_title( $menu_title );
-
- $hookname = get_plugin_page_hookname( $file, '' );
- if (!empty ( $function ) && !empty ( $hookname ))
- add_action( $hookname, $function );
-
- if ( empty($icon_url) )
- $icon_url = 'images/generic.png';
- elseif ( is_ssl() && 0 === strpos($icon_url, 'http://') )
- $icon_url = 'https://' . substr($icon_url, 7);
-
</del><ins>+ global $_wp_last_object_menu;
+
</ins><span class="cx"> $_wp_last_object_menu++;
</span><del>-
- $menu[$_wp_last_object_menu] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
-
- $_registered_pages[$hookname] = true;
-
- return $hookname;
</del><ins>+
+ return add_menu_page($page_title, $menu_title, $access_level, $file, $function, $icon_url, $_wp_last_object_menu);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function add_utility_page( $page_title, $menu_title, $access_level, $file, $function = '', $icon_url = '') {
</span><del>- global $menu, $admin_page_hooks, $_wp_last_utility_menu, $_registered_pages;
-
- $file = plugin_basename( $file );
-
- $admin_page_hooks[$file] = sanitize_title( $menu_title );
-
- $hookname = get_plugin_page_hookname( $file, '' );
- if (!empty ( $function ) && !empty ( $hookname ))
- add_action( $hookname, $function );
-
- if ( empty($icon_url) )
- $icon_url = 'images/generic.png';
- elseif ( is_ssl() && 0 === strpos($icon_url, 'http://') )
- $icon_url = 'https://' . substr($icon_url, 7);
-
</del><ins>+ global $_wp_last_utility_menu;
+
</ins><span class="cx"> $_wp_last_utility_menu++;
</span><del>-
- $menu[$_wp_last_utility_menu] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
-
- $_registered_pages[$hookname] = true;
-
- return $hookname;
</del><ins>+
+ return add_menu_page($page_title, $menu_title, $access_level, $file, $function, $icon_url, $_wp_last_utility_menu);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function add_submenu_page( $parent, $page_title, $menu_title, $access_level, $file, $function = '' ) {
</span></span></pre>
</div>
</div>
</body>
</html>