<!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>[59198] trunk: Role/Capability: Introduce the `current_user_can_for_site()` and `user_can_for_site()` functions.</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/59198">59198</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/59198","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-10-08 22:30:57 +0000 (Tue, 08 Oct 2024)</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'>Role/Capability: Introduce the `current_user_can_for_site()` and `user_can_for_site()` functions.
The `current_user_can_for_site()` function is a replacement for `current_user_can_for_blog()` which is now deprecated. `user_can_for_site()` is a renaming of the `user_can_for_blog()` function which was introduced in <a href="https://core.trac.wordpress.org/changeset/59123">[59123]</a>. The intention of this change is to prevent the introduction of a new function which uses the old "blog" naming structure.
Props swissspidy, spacedmonkey, flixos90, johnjamesjacoby
Fixes <a href="https://core.trac.wordpress.org/ticket/45197">#45197</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescapabilitiesphp">trunk/src/wp-includes/capabilities.php</a></li>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.php</a></li>
<li><a href="#trunktestsphpunittestsusercapabilitiesphp">trunk/tests/phpunit/tests/user/capabilities.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescapabilitiesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/capabilities.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/capabilities.php 2024-10-08 22:27:44 UTC (rev 59197)
+++ trunk/src/wp-includes/capabilities.php 2024-10-08 22:30:57 UTC (rev 59198)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -913,24 +913,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * capabilities such as `edit_post` and `edit_user` are capabilities used by the `map_meta_cap()` function to
</span><span class="cx" style="display: block; padding: 0 10px"> * map to primitive capabilities that a user or role has, such as `edit_posts` and `edit_others_posts`.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * This function replaces the current_user_can_for_blog() function.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * Example usage:
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * current_user_can_for_blog( $blog_id, 'edit_posts' );
- * current_user_can_for_blog( $blog_id, 'edit_post', $post->ID );
- * current_user_can_for_blog( $blog_id, 'edit_post_meta', $post->ID, $meta_key );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * current_user_can_for_site( $site_id, 'edit_posts' );
+ * current_user_can_for_site( $site_id, 'edit_post', $post->ID );
+ * current_user_can_for_site( $site_id, 'edit_post_meta', $post->ID, $meta_key );
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 3.0.0
- * @since 5.3.0 Formalized the existing and already documented `...$args` parameter
- * by adding it to the function signature.
- * @since 5.8.0 Wraps current_user_can() after switching to blog.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 6.7.0
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $blog_id Site ID.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $site_id Site ID.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $capability Capability name.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed ...$args Optional further parameters, typically starting with an object ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether the user has the given capability.
</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 current_user_can_for_blog( $blog_id, $capability, ...$args ) {
- $switched = is_multisite() ? switch_to_blog( $blog_id ) : false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function current_user_can_for_site( $site_id, $capability, ...$args ) {
+ $switched = is_multisite() ? switch_to_blog( $site_id ) : false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $can = current_user_can( $capability, ...$args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1023,19 +1022,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Example usage:
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * user_can_for_blog( $user->ID, $blog_id, 'edit_posts' );
- * user_can_for_blog( $user->ID, $blog_id, 'edit_post', $post->ID );
- * user_can_for_blog( $user->ID, $blog_id, 'edit_post_meta', $post->ID, $meta_key );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * user_can_for_site( $user->ID, $site_id, 'edit_posts' );
+ * user_can_for_site( $user->ID, $site_id, 'edit_post', $post->ID );
+ * user_can_for_site( $user->ID, $site_id, 'edit_post_meta', $post->ID, $meta_key );
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|WP_User $user User ID or object.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $blog_id Site ID.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $site_id Site ID.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $capability Capability name.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed ...$args Optional further parameters, typically starting with an object ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether the user has the given capability.
</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 user_can_for_blog( $user, $blog_id, $capability, ...$args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function user_can_for_site( $user, $site_id, $capability, ...$args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_object( $user ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $user );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1047,11 +1046,11 @@
</span><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"> // Check if the blog ID is valid.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_numeric( $blog_id ) || $blog_id <= 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_numeric( $site_id ) || $site_id <= 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">- $switched = is_multisite() ? switch_to_blog( $blog_id ) : false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $switched = is_multisite() ? switch_to_blog( $site_id ) : false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $can = user_can( $user->ID, $capability, ...$args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesdeprecatedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/deprecated.php 2024-10-08 22:27:44 UTC (rev 59197)
+++ trunk/src/wp-includes/deprecated.php 2024-10-08 22:30:57 UTC (rev 59198)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6406,3 +6406,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '6.7.0', 'wp_unique_id' );
</span><span class="cx" style="display: block; padding: 0 10px"> return $variation . '--' . md5( serialize( $block ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Returns whether the current user has the specified capability for a given site.
+ *
+ * @since 3.0.0
+ * @since 5.3.0 Formalized the existing and already documented `...$args` parameter
+ * by adding it to the function signature.
+ * @since 5.8.0 Wraps current_user_can() after switching to blog.
+ * @deprecated 6.7.0 Use current_user_can_for_site() instead.
+ *
+ * @param int $blog_id Site ID.
+ * @param string $capability Capability name.
+ * @param mixed ...$args Optional further parameters, typically starting with an object ID.
+ * @return bool Whether the user has the given capability.
+ */
+function current_user_can_for_blog( $blog_id, $capability, ...$args ) {
+ return current_user_can_for_site( $blog_id, $capability, ...$args );
+}
</ins></span></pre></div>
<a id="trunktestsphpunittestsusercapabilitiesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/capabilities.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/capabilities.php 2024-10-08 22:27:44 UTC (rev 59197)
+++ trunk/tests/phpunit/tests/user/capabilities.php 2024-10-08 22:30:57 UTC (rev 59198)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1654,9 +1654,9 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @group can_for_blog
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group can_for_site
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_current_user_can_for_blog() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_current_user_can_for_site() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user = self::$users['administrator'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1663,24 +1663,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $old_uid = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $user->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( current_user_can_for_blog( get_current_blog_id(), 'edit_posts' ) );
- $this->assertFalse( current_user_can_for_blog( get_current_blog_id(), 'foo_the_bar' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( current_user_can_for_site( get_current_blog_id(), 'edit_posts' ) );
+ $this->assertFalse( current_user_can_for_site( get_current_blog_id(), 'foo_the_bar' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( current_user_can_for_blog( 12345, 'edit_posts' ) );
- $this->assertFalse( current_user_can_for_blog( 12345, 'foo_the_bar' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( current_user_can_for_site( 12345, 'edit_posts' ) );
+ $this->assertFalse( current_user_can_for_site( 12345, 'foo_the_bar' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><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"> $suppress = $wpdb->suppress_errors();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( current_user_can_for_blog( 12345, 'edit_posts' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( current_user_can_for_site( 12345, 'edit_posts' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->suppress_errors( $suppress );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create( array( 'user_id' => $user->ID ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $blog_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( current_user_can_for_blog( $blog_id, 'edit_posts' ) );
- $this->assertFalse( current_user_can_for_blog( $blog_id, 'foo_the_bar' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( current_user_can_for_site( $blog_id, 'edit_posts' ) );
+ $this->assertFalse( current_user_can_for_site( $blog_id, 'foo_the_bar' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $another_blog_id = self::factory()->blog->create( array( 'user_id' => self::$users['author']->ID ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1687,29 +1687,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $another_blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Verify the user doesn't have a capability
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( current_user_can_for_blog( $another_blog_id, 'edit_posts' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( current_user_can_for_site( $another_blog_id, 'edit_posts' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add the current user to the site
</span><span class="cx" style="display: block; padding: 0 10px"> add_user_to_blog( $another_blog_id, $user->ID, 'author' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Verify they now have the capability
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( current_user_can_for_blog( $another_blog_id, 'edit_posts' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( current_user_can_for_site( $another_blog_id, 'edit_posts' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( $old_uid );
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @group can_for_blog
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @group can_for_site
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_user_can_for_blog() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_user_can_for_site() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = self::$users['editor'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( user_can_for_blog( $user->ID, get_current_blog_id(), 'edit_posts' ) );
- $this->assertFalse( user_can_for_blog( $user->ID, get_current_blog_id(), 'foo_the_bar' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( user_can_for_site( $user->ID, get_current_blog_id(), 'edit_posts' ) );
+ $this->assertFalse( user_can_for_site( $user->ID, get_current_blog_id(), 'foo_the_bar' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( user_can_for_blog( $user->ID, 12345, 'edit_posts' ) );
- $this->assertFalse( user_can_for_blog( $user->ID, 12345, 'foo_the_bar' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( user_can_for_site( $user->ID, 12345, 'edit_posts' ) );
+ $this->assertFalse( user_can_for_site( $user->ID, 12345, 'foo_the_bar' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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">@@ -1716,14 +1716,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create( array( 'user_id' => $user->ID ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $blog_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( user_can_for_blog( $user->ID, $blog_id, 'edit_posts' ) );
- $this->assertFalse( user_can_for_blog( $user->ID, $blog_id, 'foo_the_bar' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( user_can_for_site( $user->ID, $blog_id, 'edit_posts' ) );
+ $this->assertFalse( user_can_for_site( $user->ID, $blog_id, 'foo_the_bar' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $author = self::$users['author'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Verify another user doesn't have a capability
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_user_member_of_blog( $author->ID, $blog_id ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( user_can_for_blog( $author->ID, $blog_id, 'edit_posts' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( user_can_for_site( $author->ID, $blog_id, 'edit_posts' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add the author to the site
</span><span class="cx" style="display: block; padding: 0 10px"> add_user_to_blog( $blog_id, $author->ID, 'author' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1730,16 +1730,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Verify they now have the capability
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_user_member_of_blog( $author->ID, $blog_id ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( user_can_for_blog( $author->ID, $blog_id, 'edit_posts' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( user_can_for_site( $author->ID, $blog_id, 'edit_posts' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Verify the user doesn't have a capability for a non-existent site
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( user_can_for_blog( $user->ID, -1, 'edit_posts' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( user_can_for_site( $user->ID, -1, 'edit_posts' ) );
</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="cx" style="display: block; padding: 0 10px"> * @group ms-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">- public function test_borked_current_user_can_for_blog() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_borked_current_user_can_for_site() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $orig_blog_id = get_current_blog_id();
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1747,7 +1747,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'switch_blog', array( $this, 'nullify_current_user_and_keep_nullifying_user' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- current_user_can_for_blog( $blog_id, 'edit_posts' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ current_user_can_for_site( $blog_id, 'edit_posts' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $orig_blog_id, get_current_blog_id() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>