Changeset 13713

Timestamp:

03/16/2010 03:31:50 PM (16 years ago)

Author:

wpmuguru

Message:

introduce global_terms_enabled site option, see #12589

Location:

trunk/wp-admin

Files:

• includes/schema.php (modified) (1 diff)
• includes/upgrade.php (modified) (1 diff)
• ms-edit.php (modified) (1 diff)
• ms-options.php (modified) (1 diff)

trunk/wp-admin/includes/schema.php

@@ -710 +710 @@
         'subdomain_install' => intval( $subdomain_install ),
     );
+    if ( is_multisite() )
+        $sitemeta[ 'global_terms_enabled' ] = get_site_option( 'global_terms_enabled', '0' );
+    else
+        $sitemeta[ 'global_terms_enabled' ] = '0';
 
     $insert = '';

trunk/wp-admin/includes/upgrade.php

@@ -1150 +1150 @@
         }
     }
+    // 3.0
+    if ( $wp_current_db_version < 13576 )
+        update_site_option( 'global_terms_enabled', '1' );
 }
 

trunk/wp-admin/ms-edit.php

@@ -108 +108 @@
         }
         update_site_option( "dashboard_blog", $dashboard_blog_id );
-        $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' );
+        $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' );
         $checked_options = array('mu_media_buttons', 'menu_items');
         foreach ( $checked_options as $option_name ) {

trunk/wp-admin/ms-options.php

@@ -43 +43 @@
                     <?php printf( __( 'Registration and support mails will come from this address. Make it generic like "support@%s"' ), $current_site->domain ); ?>
                 </td>
+            </tr>
+
+            <tr valign="top">
+                <th scope="row"><?php _e('Global Terms') ?></th>
+                <td>
+                <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 />
+                <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 />
+                <?php _e( 'Maintain a global list of terms from all sites across the network.' ); ?></td>
             </tr>
         </table>