WordPress.org

Make WordPress Core

Changeset 14734


Ignore:
Timestamp:
05/19/2010 05:12:01 AM (8 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:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/ms-edit.php

    r14720 r14734  
    142142    break;
    143143    case 'addblog':
    144         check_admin_referer( 'add-blog' );
     144        check_admin_referer( 'add-blog', '_wpnonce_add-blog' );
    145145
    146146        if ( ! current_user_can( 'manage_sites' ) )
     
    326326    case 'allblogs':
    327327        if ( isset( $_POST['doaction']) || isset($_POST['doaction2'] ) ) {
    328             check_admin_referer( 'bulk-ms-sites' );
     328            check_admin_referer( 'bulk-ms-sites', '_wpnonce_bulk-ms-sites' );
    329329
    330330            if ( ! current_user_can( 'manage_sites' ) )
     
    508508
    509509        if ( isset( $_POST['doaction']) || isset($_POST['doaction2'] ) ) {
    510             check_admin_referer( 'bulk-ms-users' );
     510            check_admin_referer( 'bulk-ms-users', '_wpnonce_bulk-ms-users' );
    511511
    512512            if ( $_GET['action'] != -1 || $_POST['action2'] != -1 )
     
    591591
    592592    case 'adduser':
    593         check_admin_referer( 'add-user' );
     593        check_admin_referer( 'add-user', '_wpnonce_add-user' );
    594594        if ( ! current_user_can( 'manage_network_users' ) )
    595595            wp_die( __( 'You do not have permission to access this page.' ) );
  • trunk/wp-admin/ms-options.php

    r14669 r14734  
    5656                <th scope="row"><?php _e( 'Global Terms' ) ?></th>
    5757                <td>
    58                 <label><input type="radio" name="global_terms_enabled" value="0"<?php checked( get_site_option( 'global_terms_enabled' ), 0 ) ?>/> <?php _e( 'Disabled' ); ?></label><br/>
    59                 <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 />
     58                <label><input type="radio" name="global_terms_enabled" value="0"<?php checked( !! get_site_option( 'global_terms_enabled' ), false ) ?>/> <?php _e( 'Disabled' ); ?></label><br/>
     59                <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 />
    6060                <?php if ( ! get_site_option( 'global_terms_enabled') ) { ?>
    6161                <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

    r14720 r14734  
    419419            </select>
    420420            <input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction" id="doaction" class="button-secondary action" />
    421             <?php wp_nonce_field( 'bulk-ms-sites' ); ?>
     421            <?php wp_nonce_field( 'bulk-ms-sites', '_wpnonce_bulk-ms-sites' ); ?>
    422422        </div>
    423423
     
    680680            <h3><?php _e( 'Add Site' ) ?></h3>
    681681            <form method="post" action="ms-edit.php?action=addblog">
    682                 <?php wp_nonce_field( 'add-blog' ) ?>
     682                <?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ) ?>
    683683                <table class="form-table">
    684684                    <tr class="form-field form-required">
  • trunk/wp-admin/ms-users.php

    r14647 r14734  
    135135                </select>
    136136                <input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction" id="doaction" class="button-secondary action" />
    137                 <?php wp_nonce_field( 'bulk-ms-users' ); ?>
     137                <?php wp_nonce_field( 'bulk-ms-users', '_wpnonce_bulk-ms-users' ); ?>
    138138            </div>
    139139
     
    356356    </table>
    357357    <p class="submit">
    358         <?php wp_nonce_field( 'add-user' ) ?>
     358        <?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
    359359        <input class="button" type="submit" value="<?php esc_attr_e( 'Add user' ) ?>" /></p>
    360360    </form>
Note: See TracChangeset for help on using the changeset viewer.