<!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>[16764] trunk/wp-admin:
Introduce can_edit_site to replace inline checks on whether or not the site_id is for the current Network
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16764">16764</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-12-07 14:28:40 +0000 (Tue, 07 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce can_edit_site to replace inline checks on whether or not the site_id is for the current Network. See <a href="http://trac.wordpress.org/ticket/15716">#15716</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpmsuserslisttablephp">trunk/wp-admin/includes/class-wp-ms-users-list-table.php</a></li>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminnetworksiteinfophp">trunk/wp-admin/network/site-info.php</a></li>
<li><a href="#trunkwpadminnetworksiteoptionsphp">trunk/wp-admin/network/site-options.php</a></li>
<li><a href="#trunkwpadminnetworksitethemesphp">trunk/wp-admin/network/site-themes.php</a></li>
<li><a href="#trunkwpadminnetworksiteusersphp">trunk/wp-admin/network/site-users.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpmsuserslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-users-list-table.php (16763 => 16764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-users-list-table.php 2010-12-07 12:45:24 UTC (rev 16763)
+++ trunk/wp-admin/includes/class-wp-ms-users-list-table.php 2010-12-07 14:28:40 UTC (rev 16764)
</span><span class="lines">@@ -217,11 +217,12 @@
</span><span class="cx"> echo "<td $attributes>";
</span><span class="cx"> if ( is_array( $blogs ) ) {
</span><span class="cx"> foreach ( (array) $blogs as $key => $val ) {
</span><del>- if ( $current_site->id != $val->site_id ) continue;
</del><ins>+ if ( !can_edit_site( $val->site_id ) )
+ continue;
</ins><span class="cx">
</span><del>- $path = ( $val->path == '/' ) ? '' : $val->path;
</del><ins>+ $path = ( $val->path == '/' ) ? '' : $val->path;
</ins><span class="cx"> echo '<a href="'. esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) .'">' . str_replace( '.' . $current_site->domain, '', $val->domain . $path ) . '</a>';
</span><del>- echo ' <small class="row-actions">';
</del><ins>+ echo ' <small class="row-actions site-' . $val->site_id . '">';
</ins><span class="cx"> $actions = array();
</span><span class="cx"> $actions['edit'] = '<a href="'. esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) .'">' . __( 'Edit' ) . '</a>';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (16763 => 16764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-12-07 12:45:24 UTC (rev 16763)
+++ trunk/wp-admin/includes/ms.php 2010-12-07 14:28:40 UTC (rev 16764)
</span><span class="lines">@@ -721,4 +721,22 @@
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+/**
+ * Whether or not we can edit this site from this page
+ *
+ * By default editing of sites is restricted to the Network Admin for that site_id this allows for this to be overridden
+ *
+ * @since 3.1.0
+ * @param integer $site_id The site id to check.
+ */
+function can_edit_site( $site_id ) {
+ global $wpdb;
+
+ if ($site_id == $wpdb->siteid )
+ $result = true;
+ else
+ $result = false;
+
+ return apply_filters( 'can_edit_site', $result, $site_id );
+}
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminnetworksiteinfophp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-info.php (16763 => 16764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-info.php 2010-12-07 12:45:24 UTC (rev 16763)
+++ trunk/wp-admin/network/site-info.php 2010-12-07 14:28:40 UTC (rev 16764)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> wp_die( __('Invalid site ID.') );
</span><span class="cx">
</span><span class="cx"> $details = get_blog_details( $id );
</span><del>-if ( $details->site_id != $wpdb->siteid )
</del><ins>+if ( !can_edit_site( $details->site_id ) )
</ins><span class="cx"> wp_die( __( 'You do not have permission to access this page.' ) );
</span><span class="cx">
</span><span class="cx"> $is_main_site = is_main_site( $id );
</span></span></pre></div>
<a id="trunkwpadminnetworksiteoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-options.php (16763 => 16764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-options.php 2010-12-07 12:45:24 UTC (rev 16763)
+++ trunk/wp-admin/network/site-options.php 2010-12-07 14:28:40 UTC (rev 16764)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> wp_die( __('Invalid site ID.') );
</span><span class="cx">
</span><span class="cx"> $details = get_blog_details( $id );
</span><del>-if ( $details->site_id != $wpdb->siteid )
</del><ins>+if ( !can_edit_site( $details->site_id ) )
</ins><span class="cx"> wp_die( __( 'You do not have permission to access this page.' ) );
</span><span class="cx">
</span><span class="cx"> $is_main_site = is_main_site( $id );
</span></span></pre></div>
<a id="trunkwpadminnetworksitethemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-themes.php (16763 => 16764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-themes.php 2010-12-07 12:45:24 UTC (rev 16763)
+++ trunk/wp-admin/network/site-themes.php 2010-12-07 14:28:40 UTC (rev 16764)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> $wp_list_table->prepare_items();
</span><span class="cx">
</span><span class="cx"> $details = get_blog_details( $id );
</span><del>-if ( $details->site_id != $wpdb->siteid )
</del><ins>+if ( !can_edit_site( $details->site_id ) )
</ins><span class="cx"> wp_die( __( 'You do not have permission to access this page.' ) );
</span><span class="cx">
</span><span class="cx"> $is_main_site = is_main_site( $id );
</span></span></pre></div>
<a id="trunkwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-users.php (16763 => 16764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-users.php 2010-12-07 12:45:24 UTC (rev 16763)
+++ trunk/wp-admin/network/site-users.php 2010-12-07 14:28:40 UTC (rev 16764)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> wp_die( __('Invalid site ID.') );
</span><span class="cx">
</span><span class="cx"> $details = get_blog_details( $id );
</span><del>-if ( $details->site_id != $wpdb->siteid )
</del><ins>+if ( !can_edit_site( $details->site_id ) )
</ins><span class="cx"> wp_die( __( 'You do not have permission to access this page.' ) );
</span><span class="cx">
</span><span class="cx"> $is_main_site = is_main_site( $id );
</span></span></pre>
</div>
</div>
</body>
</html>