<!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>[15754] trunk/wp-admin/includes/plugin.php: Revert part of [15753].</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15754">15754</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-10-07 22:58:45 +0000 (Thu, 07 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert part of <a href="http://trac.wordpress.org/changeset/15753">[15753]</a>. See <a href="http://trac.wordpress.org/changeset/12914">[12914]</a>. See <a href="http://trac.wordpress.org/ticket/14666">#14666</a></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 (15753 => 15754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2010-10-07 22:35:31 UTC (rev 15753)
+++ trunk/wp-admin/includes/plugin.php 2010-10-07 22:58:45 UTC (rev 15754)
</span><span class="lines">@@ -852,6 +852,12 @@
</span><span class="cx"> /**
</span><span class="cx"> * Add a top level menu page in the 'objects' section
</span><span class="cx"> *
</span><ins>+ * This function takes a capability which will be used to determine whether
+ * or not a page is included in the menu.
+ *
+ * The function which is hooked in to handle the output of the page must check
+ * that the user has the required capability as well.
+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -870,6 +876,12 @@
</span><span class="cx"> /**
</span><span class="cx"> * Add a top level menu page in the 'utility' section
</span><span class="cx"> *
</span><ins>+ * This function takes a capability which will be used to determine whether
+ * or not a page is included in the menu.
+ *
+ * The function which is hooked in to handle the output of the page must check
+ * that the user has the required capability as well.
+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -888,6 +900,12 @@
</span><span class="cx"> /**
</span><span class="cx"> * Add a sub menu page
</span><span class="cx"> *
</span><ins>+ * This function takes a capability which will be used to determine whether
+ * or not a page is included in the menu.
+ *
+ * The function which is hooked in to handle the output of the page must check
+ * that the user has the required capability as well.
+ *
</ins><span class="cx"> * @param string $parent_slug The slug name for the parent menu (or the file name of a standard WordPress admin page)
</span><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="lines">@@ -944,7 +962,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add sub menu page to the tools main menu.
</span><ins>+*
+ * This function takes a capability which will be used to determine whether
+ * or not a page is included in the menu.
</ins><span class="cx"> *
</span><ins>+ * The function which is hooked in to handle the output of the page must check
+ * that the user has the required capability as well.
+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -957,7 +981,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add sub menu page to the options main menu.
</span><ins>+*
+ * This function takes a capability which will be used to determine whether
+ * or not a page is included in the menu.
</ins><span class="cx"> *
</span><ins>+ * The function which is hooked in to handle the output of the page must check
+ * that the user has the required capability as well.
+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -970,7 +1000,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add sub menu page to the themes main menu.
</span><ins>+*
+ * This function takes a capability which will be used to determine whether
+ * or not a page is included in the menu.
</ins><span class="cx"> *
</span><ins>+ * The function which is hooked in to handle the output of the page must check
+ * that the user has the required capability as well.
+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -983,7 +1019,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add sub menu page to the plugins main menu.
</span><ins>+*
+ * This function takes a capability which will be used to determine whether
+ * or not a page is included in the menu.
</ins><span class="cx"> *
</span><ins>+ * The function which is hooked in to handle the output of the page must check
+ * that the user has the required capability as well.
+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -996,7 +1038,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add sub menu page to the Users/Profile main menu.
</span><ins>+*
+ * This function takes a capability which will be used to determine whether
+ * or not a page is included in the menu.
</ins><span class="cx"> *
</span><ins>+ * The function which is hooked in to handle the output of the page must check
+ * that the user has the required capability as well.
+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -1012,7 +1060,13 @@
</span><span class="cx"> }
</span><span class="cx"> /**
</span><span class="cx"> * Add sub menu page to the Dashboard main menu.
</span><ins>+*
+ * This function takes a capability which will be used to determine whether
+ * or not a page is included in the menu.
</ins><span class="cx"> *
</span><ins>+ * The function which is hooked in to handle the output of the page must check
+ * that the user has the required capability as well.
+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -1025,7 +1079,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add sub menu page to the posts main menu.
</span><ins>+*
+ * This function takes a capability which will be used to determine whether
+ * or not a page is included in the menu.
</ins><span class="cx"> *
</span><ins>+ * The function which is hooked in to handle the output of the page must check
+ * that the user has the required capability as well.
+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -1038,7 +1098,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add sub menu page to the media main menu.
</span><ins>+*
+ * This function takes a capability which will be used to determine whether
+ * or not a page is included in the menu.
</ins><span class="cx"> *
</span><ins>+ * The function which is hooked in to handle the output of the page must check
+ * that the user has the required capability as well.
+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -1051,7 +1117,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add sub menu page to the links main menu.
</span><ins>+*
+ * This function takes a capability which will be used to determine whether
+ * or not a page is included in the menu.
</ins><span class="cx"> *
</span><ins>+ * The function which is hooked in to handle the output of the page must check
+ * that the user has the required capability as well.
+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -1064,7 +1136,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add sub menu page to the pages main menu.
</span><ins>+*
+ * This function takes a capability which will be used to determine whether
+ * or not a page is included in the menu.
</ins><span class="cx"> *
</span><ins>+ * The function which is hooked in to handle the output of the page must check
+ * that the user has the required capability as well.
+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -1077,7 +1155,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add sub menu page to the comments main menu.
</span><ins>+*
+ * This function takes a capability which will be used to determine whether
+ * or not a page is included in the menu.
</ins><span class="cx"> *
</span><ins>+ * The function which is hooked in to handle the output of the page must check
+ * that the user has the required capability as well.
+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span></span></pre>
</div>
</div>
</body>
</html>