<!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>[25497] trunk/src/wp-admin/includes/ms.php: Some more tweaks for the documentation in wp-admin/includes/ms.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 { 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25497">25497</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2013-09-19 16:05:21 +0000 (Thu, 19 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Some more tweaks for the documentation in wp-admin/includes/ms.php. see <a href="http://core.trac.wordpress.org/ticket/25229">#25229</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesmsphp">trunk/src/wp-admin/includes/ms.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/ms.php (25496 => 25497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/ms.php 2013-09-19 08:45:06 UTC (rev 25496)
+++ trunk/src/wp-admin/includes/ms.php 2013-09-19 16:05:21 UTC (rev 25497)
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since MU
</span><span class="cx"> *
</span><del>- * @param int $id User ID of the user about to be deleted from the network.
</del><ins>+ * @param int $id ID of the user about to be deleted from the network.
</ins><span class="cx"> */
</span><span class="cx"> do_action( 'wpmu_delete_user', $id );
</span><span class="cx">
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.8.0
</span><span class="cx"> *
</span><del>- * @param int $id User ID of the user that was deleted from the network.
</del><ins>+ * @param int $id ID of the user that was deleted from the network.
</ins><span class="cx"> */
</span><span class="cx"> do_action( 'deleted_user', $id );
</span><span class="cx">
</span><span class="lines">@@ -451,7 +451,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><del>- * @param int $id User ID of the user marked as SPAM.
</del><ins>+ * @param int $id ID of the user marked as SPAM.
</ins><span class="cx"> */
</span><span class="cx"> do_action( 'make_spam_user', $id );
</span><span class="cx"> } else {
</span><span class="lines">@@ -460,7 +460,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><del>- * @param int $id User ID of the user marked as HAM.
</del><ins>+ * @param int $id ID of the user marked as HAM.
</ins><span class="cx"> */
</span><span class="cx"> do_action( 'make_ham_user', $id );
</span><span class="cx"> }
</span><span class="lines">@@ -694,16 +694,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Grants super admin privileges.
</del><ins>+ * Grants Super Admin privileges.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><del>- * @param int $user_id
</del><ins>+ * @param int $user_id ID of the user to be granted Super Admin privileges.
</ins><span class="cx"> */
</span><span class="cx"> function grant_super_admin( $user_id ) {
</span><span class="cx"> global $super_admins;
</span><span class="cx">
</span><span class="cx"> // If global super_admins override is defined, there is nothing to do here.
</span><del>- if ( isset($super_admins) )
</del><ins>+ if ( isset( $super_admins ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -711,7 +711,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><del>- * @param int $user_id User ID of the user that is about to be granted Super Admin privileges.
</del><ins>+ * @param int $user_id ID of the user that is about to be granted Super Admin privileges.
</ins><span class="cx"> */
</span><span class="cx"> do_action( 'grant_super_admin', $user_id );
</span><span class="cx">
</span><span class="lines">@@ -728,7 +728,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><del>- * @param int $user_id User ID of the user that was granted Super Admin privileges.
</del><ins>+ * @param int $user_id ID of the user that was granted Super Admin privileges.
</ins><span class="cx"> */
</span><span class="cx"> do_action( 'granted_super_admin', $user_id );
</span><span class="cx"> return true;
</span><span class="lines">@@ -737,23 +737,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Revokes super admin privileges.
</del><ins>+ * Revokes Super Admin privileges.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><del>- * @param int $user_id
</del><ins>+ * @param int $user_id ID of the user Super Admin privileges to be revoked from.
</ins><span class="cx"> */
</span><span class="cx"> function revoke_super_admin( $user_id ) {
</span><span class="cx"> global $super_admins;
</span><span class="cx">
</span><span class="cx"> // If global super_admins override is defined, there is nothing to do here.
</span><del>- if ( isset($super_admins) )
</del><ins>+ if ( isset( $super_admins ) )
</ins><span class="cx"> return false;
</span><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Fires before the user's Super Admin privileges are revoked.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><del>- * @param int $user_id User ID of the user Super Admin privileges are being revoked from.
</del><ins>+ * @param int $user_id ID of the user Super Admin privileges are being revoked from.
</ins><span class="cx"> */
</span><span class="cx"> do_action( 'revoke_super_admin', $user_id );
</span><span class="cx">
</span><span class="lines">@@ -771,7 +772,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><del>- * @param int $user_id User ID of the user Super Admin privileges were revoked from.
</del><ins>+ * @param int $user_id ID of the user Super Admin privileges were revoked from.
</ins><span class="cx"> */
</span><span class="cx"> do_action( 'revoked_super_admin', $user_id );
</span><span class="cx"> return true;
</span><span class="lines">@@ -791,10 +792,11 @@
</span><span class="cx"> function can_edit_network( $site_id ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- if ($site_id == $wpdb->siteid )
</del><ins>+ if ( $site_id == $wpdb->siteid )
</ins><span class="cx"> $result = true;
</span><span class="cx"> else
</span><span class="cx"> $result = false;
</span><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Filter whether this network can be edited from this page.
</span><span class="cx"> *
</span></span></pre>
</div>
</div>
</body>
</html>