Changeset 16764

Timestamp:

12/07/2010 02:28:40 PM (14 years ago)

Author:

westi

Message:

Introduce can_edit_site to replace inline checks on whether or not the site_id is for the current Network. See #15716.

Location:

trunk/wp-admin

Files:

• includes/class-wp-ms-users-list-table.php (modified) (1 diff)
• includes/ms.php (modified) (1 diff)
• network/site-info.php (modified) (1 diff)
• network/site-options.php (modified) (1 diff)
• network/site-themes.php (modified) (1 diff)
• network/site-users.php (modified) (1 diff)

trunk/wp-admin/includes/class-wp-ms-users-list-table.php

@@ -218 +218 @@
                             if ( is_array( $blogs ) ) {
                                 foreach ( (array) $blogs as $key => $val ) {
-                                    if ( $current_site->id != $val->site_id ) continue;
-                                    
-                                        $path   = ( $val->path == '/' ) ? '' : $val->path;
+                                    if ( !can_edit_site( $val->site_id ) )
+                                        continue;
+                                    
+                                    $path   = ( $val->path == '/' ) ? '' : $val->path;
                                     echo '<a href="'. esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) .'">' . str_replace( '.' . $current_site->domain, '', $val->domain . $path ) . '</a>';
-                                    echo ' <small class="row-actions">';
+                                    echo ' <small class="row-actions site-' . $val->site_id . '">';
                                     $actions = array();
                                     $actions['edit'] = '<a href="'. esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) .'">' . __( 'Edit' ) . '</a>';

trunk/wp-admin/includes/ms.php

@@ -722 +722 @@
     return false;
 }
+/**
+ * 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 );
+}
 ?>

trunk/wp-admin/network/site-info.php

@@ -23 +23 @@
 
 $details = get_blog_details( $id );
-if ( $details->site_id != $wpdb->siteid )
+if ( !can_edit_site( $details->site_id ) )
     wp_die( __( 'You do not have permission to access this page.' ) );
 

trunk/wp-admin/network/site-options.php

@@ -23 +23 @@
 
 $details = get_blog_details( $id );
-if ( $details->site_id != $wpdb->siteid )
+if ( !can_edit_site( $details->site_id ) )
     wp_die( __( 'You do not have permission to access this page.' ) );
 

trunk/wp-admin/network/site-themes.php

@@ -32 +32 @@
 
 $details = get_blog_details( $id );
-if ( $details->site_id != $wpdb->siteid )
+if ( !can_edit_site( $details->site_id ) )
     wp_die( __( 'You do not have permission to access this page.' ) );
 

trunk/wp-admin/network/site-users.php

@@ -29 +29 @@
 
 $details = get_blog_details( $id );
-if ( $details->site_id != $wpdb->siteid )
+if ( !can_edit_site( $details->site_id ) )
     wp_die( __( 'You do not have permission to access this page.' ) );