<!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 { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { 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>[15203] trunk/wp-admin/includes/plugin.php: Introduce  menu_page_url()
  for plugins to use to get the url for the pages they have added.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15203">15203</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-06-10 21:38:41 +0000 (Thu, 10 Jun 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Introduce  menu_page_url() for plugins to use to get the url for the pages they have added. Fixes  <a href="http://trac.wordpress.org/ticket/13829">#13829</a> props o'malley for all the cuteness.</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 (15202 => 15203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php        2010-06-10 21:31:46 UTC (rev 15202)
+++ trunk/wp-admin/includes/plugin.php        2010-06-10 21:38:41 UTC (rev 15203)
</span><span class="lines">@@ -817,7 +817,7 @@
</span><span class="cx">  * @param int $position The position in the menu order this one should appear
</span><span class="cx">  */
</span><span class="cx"> function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '', $position = NULL ) {
</span><del>-        global $menu, $admin_page_hooks, $_registered_pages;
</del><ins>+        global $menu, $admin_page_hooks, $_registered_pages, $_parent_pages;
</ins><span class="cx"> 
</span><span class="cx">         $menu_slug = plugin_basename( $menu_slug );
</span><span class="cx"> 
</span><span class="lines">@@ -842,6 +842,9 @@
</span><span class="cx"> 
</span><span class="cx">         $_registered_pages[$hookname] = true;
</span><span class="cx"> 
</span><ins>+        // No parent as top level
+        $_parent_pages[$menu_slug] = false;
+        
</ins><span class="cx">         return $hookname;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -915,6 +918,7 @@
</span><span class="cx">         global $_wp_real_parent_file;
</span><span class="cx">         global $_wp_submenu_nopriv;
</span><span class="cx">         global $_registered_pages;
</span><ins>+        global $_parent_pages;
</ins><span class="cx"> 
</span><span class="cx">         $menu_slug = plugin_basename( $menu_slug );
</span><span class="cx">         $parent_slug = plugin_basename( $parent_slug);
</span><span class="lines">@@ -949,6 +953,9 @@
</span><span class="cx">         if ( 'tools.php' == $parent_slug )
</span><span class="cx">                 $_registered_pages[get_plugin_page_hookname( $menu_slug, 'edit.php')] = true;
</span><span class="cx"> 
</span><ins>+        // No parent as top level
+        $_parent_pages[$menu_slug] = $parent_slug;
+                
</ins><span class="cx">         return $hookname;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1164,6 +1171,38 @@
</span><span class="cx">         return add_submenu_page( 'edit-comments.php', $page_title, $menu_title, $capability, $menu_slug, $function );
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+/**
+ * Get the url to access a particular menu page based on the slug it was registered with.
+ * 
+ * If the slug hasn't been registered properly no url will be returned
+ * 
+ * @since 3.0
+ * 
+ * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu)
+ * @param bool $echo Whether or not to echo the url - default is true
+ * @return string the url
+ */
+function menu_page_url($menu_slug, $echo = true) {
+        global $_parent_pages;
+                
+        if ( isset( $_parent_pages[$menu_slug] ) ) {
+                if ( $_parent_pages[$menu_slug] ) {
+                        $url = admin_url($_parent_pages[$menu_slug] . '?page=' . $menu_slug);
+                } else {
+                        $url = admin_url('admin.php?page=' . $menu_slug);
+                }
+        } else {
+                $url = '';
+        }
+        
+        $url = esc_url($url);
+        
+        if ( $echo )
+                echo $url;
+        
+        return $url;
+}
+
</ins><span class="cx"> //
</span><span class="cx"> // Pluggable Menu Support -- Private
</span><span class="cx"> //
</span></span></pre>
</div>
</div>

</body>
</html>