WordPress.org

Make WordPress Core

Changeset 13713


Ignore:
Timestamp:
03/16/10 15:31:50 (4 years ago)
Author:
wpmuguru
Message:

introduce global_terms_enabled site option, see #12589

Location:
trunk/wp-admin
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/schema.php

    r13655 r13713  
    710710        'subdomain_install' => intval( $subdomain_install ), 
    711711    ); 
     712    if ( is_multisite() ) 
     713        $sitemeta[ 'global_terms_enabled' ] = get_site_option( 'global_terms_enabled', '0' ); 
     714    else 
     715        $sitemeta[ 'global_terms_enabled' ] = '0'; 
    712716 
    713717    $insert = ''; 
  • trunk/wp-admin/includes/upgrade.php

    r13618 r13713  
    11501150        } 
    11511151    } 
     1152    // 3.0 
     1153    if ( $wp_current_db_version < 13576 ) 
     1154        update_site_option( 'global_terms_enabled', '1' ); 
    11521155} 
    11531156 
  • trunk/wp-admin/ms-edit.php

    r13654 r13713  
    108108        } 
    109109        update_site_option( "dashboard_blog", $dashboard_blog_id ); 
    110         $options = array( 'registrationnotification', 'registration', 'add_new_users', 'menu_items', 'mu_media_buttons', 'upload_space_check_disabled', 'blog_upload_space', 'upload_filetypes', 'site_name', 'first_post', 'first_page', 'first_comment', 'first_comment_url', 'first_comment_author', 'welcome_email', 'welcome_user_email', 'fileupload_maxk', 'admin_notice_feed' ); 
     110        $options = array( 'registrationnotification', 'registration', 'add_new_users', 'menu_items', 'mu_media_buttons', 'upload_space_check_disabled', 'blog_upload_space', 'upload_filetypes', 'site_name', 'first_post', 'first_page', 'first_comment', 'first_comment_url', 'first_comment_author', 'welcome_email', 'welcome_user_email', 'fileupload_maxk', 'admin_notice_feed', 'global_terms_enabled' ); 
    111111        $checked_options = array('mu_media_buttons', 'menu_items'); 
    112112        foreach ( $checked_options as $option_name ) { 
  • trunk/wp-admin/ms-options.php

    r13708 r13713  
    4343                    <?php printf( __( 'Registration and support mails will come from this address. Make it generic like "support@%s"' ), $current_site->domain ); ?> 
    4444                </td> 
     45            </tr> 
     46 
     47            <tr valign="top"> 
     48                <th scope="row"><?php _e('Global Terms') ?></th> 
     49                <td> 
     50                <label><input type='radio' id="global_terms_enabled" name="global_terms_enabled" value='1' <?php checked( get_site_option( 'global_terms_enabled' ), 1 ) ?>/> <?php _e( 'Enabled' ); ?></label><br /> 
     51                <label><input type='radio' id="global_terms_enabled" name="global_terms_enabled" value='0' <?php checked( get_site_option( 'global_terms_enabled' ), 0 ) ?>/> <?php _e( 'Disabled' ); ?></label><br /> 
     52                <?php _e( 'Maintain a global list of terms from all sites across the network.' ); ?></td> 
    4553            </tr> 
    4654        </table> 
Note: See TracChangeset for help on using the changeset viewer.