Changeset 14734

Timestamp:

05/19/2010 05:12:01 AM (15 years ago)

Author:

markjaquith

Message:

Cast global_terms_enabled to bool before doing checked() so that FALSE matches as well as 0.

Location:

trunk/wp-admin

Files:

• ms-edit.php (modified) (4 diffs)
• ms-options.php (modified) (1 diff)
• ms-sites.php (modified) (2 diffs)
• ms-users.php (modified) (2 diffs)

trunk/wp-admin/ms-edit.php

@@ -142 +142 @@
     break;
     case 'addblog':
-        check_admin_referer( 'add-blog' );
+        check_admin_referer( 'add-blog', '_wpnonce_add-blog' );
 
         if ( ! current_user_can( 'manage_sites' ) )
@@ -326 +326 @@
     case 'allblogs':
         if ( isset( $_POST['doaction']) || isset($_POST['doaction2'] ) ) {
-            check_admin_referer( 'bulk-ms-sites' );
+            check_admin_referer( 'bulk-ms-sites', '_wpnonce_bulk-ms-sites' );
 
             if ( ! current_user_can( 'manage_sites' ) )
@@ -508 +508 @@
 
         if ( isset( $_POST['doaction']) || isset($_POST['doaction2'] ) ) {
-            check_admin_referer( 'bulk-ms-users' );
+            check_admin_referer( 'bulk-ms-users', '_wpnonce_bulk-ms-users' );
 
             if ( $_GET['action'] != -1 || $_POST['action2'] != -1 )
@@ -591 +591 @@
 
     case 'adduser':
-        check_admin_referer( 'add-user' );
+        check_admin_referer( 'add-user', '_wpnonce_add-user' );
         if ( ! current_user_can( 'manage_network_users' ) )
             wp_die( __( 'You do not have permission to access this page.' ) );

trunk/wp-admin/ms-options.php

@@ -56 +56 @@
                 <th scope="row"><?php _e( 'Global Terms' ) ?></th>
                 <td>
-                <label><input type="radio" name="global_terms_enabled" value="0"<?php checked( get_site_option( 'global_terms_enabled' ), 0 ) ?>/> <?php _e( 'Disabled' ); ?></label><br/>
-                <label><input type="radio" name="global_terms_enabled" value="1"<?php checked( get_site_option( 'global_terms_enabled' ), 1 ) ?>/> <?php _e( 'Maintain a global list of terms from all sites across the network.' ); ?></label><br />
+                <label><input type="radio" name="global_terms_enabled" value="0"<?php checked( !! get_site_option( 'global_terms_enabled' ), false ) ?>/> <?php _e( 'Disabled' ); ?></label><br/>
+                <label><input type="radio" name="global_terms_enabled" value="1"<?php checked( !! get_site_option( 'global_terms_enabled' ), true ) ?>/> <?php _e( 'Maintain a global list of terms from all sites across the network.' ); ?></label><br />
                 <?php if ( ! get_site_option( 'global_terms_enabled') ) { ?>
                 <strong><?php _e( 'Warning!' ); ?></strong> <?php _e( 'Enabling global terms will create a new table and synchronize terms across the network.' ); ?>

trunk/wp-admin/ms-sites.php

@@ -419 +419 @@
             </select>
             <input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction" id="doaction" class="button-secondary action" />
-            <?php wp_nonce_field( 'bulk-ms-sites' ); ?>
+            <?php wp_nonce_field( 'bulk-ms-sites', '_wpnonce_bulk-ms-sites' ); ?>
         </div>
 
@@ -680 +680 @@
             <h3><?php _e( 'Add Site' ) ?></h3>
             <form method="post" action="ms-edit.php?action=addblog">
-                <?php wp_nonce_field( 'add-blog' ) ?>
+                <?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ) ?>
                 <table class="form-table">
                     <tr class="form-field form-required">

trunk/wp-admin/ms-users.php

@@ -135 +135 @@
                 </select>
                 <input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction" id="doaction" class="button-secondary action" />
-                <?php wp_nonce_field( 'bulk-ms-users' ); ?>
+                <?php wp_nonce_field( 'bulk-ms-users', '_wpnonce_bulk-ms-users' ); ?>
             </div>
 
@@ -356 +356 @@
     </table>
     <p class="submit">
-        <?php wp_nonce_field( 'add-user' ) ?>
+        <?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
         <input class="button" type="submit" value="<?php esc_attr_e( 'Add user' ) ?>" /></p>
     </form>