Changeset 13745

Timestamp:

03/18/2010 07:50:43 AM (16 years ago)

Author:

dd32

Message:

Remove Options -> Misc entirely as core as there are no longer options left there. Plugin registered options will be redirected to the General settings page. Fixes #12437

Location:

trunk/wp-admin

Files:

• includes/plugin.php (modified) (2 diffs)
• includes/template.php (modified) (2 diffs)
• menu.php (modified) (1 diff)
• options-misc.php (deleted)

trunk/wp-admin/includes/plugin.php

@@ -1453 +1453 @@
 function add_option_update_handler($option_group, $option_name, $sanitize_callback = '') {
         global $new_whitelist_options;
+
+        if ( 'misc' == $option_group )
+                $option_group = 'general';
+
         $new_whitelist_options[ $option_group ][] = $option_name;
         if ( $sanitize_callback != '' )
@@ -1469 +1473 @@
 function remove_option_update_handler($option_group, $option_name, $sanitize_callback = '') {
         global $new_whitelist_options;
+
+        if ( 'misc' == $option_group )
+                $option_group = 'general';
+
         $pos = array_search( $option_name, (array) $new_whitelist_options );
         if ( $pos !== false )

trunk/wp-admin/includes/template.php

@@ -2981 +2981 @@
         global $wp_settings_sections;
 
+        if ( 'misc' == $page )
+                $page = 'general';
+
         if ( !isset($wp_settings_sections) )
                 $wp_settings_sections = array();
@@ -3015 +3018 @@
 function add_settings_field($id, $title, $callback, $page, $section = 'default', $args = array()) {
         global $wp_settings_fields;
+
+        if ( 'misc' == $page )
+                $page = 'general';
 
         if ( !isset($wp_settings_fields) )

trunk/wp-admin/menu.php

@@ -194 +194 @@
         $submenu['options-general.php'][35] = array(__('Privacy'), 'manage_options', 'options-privacy.php');
         $submenu['options-general.php'][40] = array(__('Permalinks'), 'manage_options', 'options-permalink.php');
-        if ( is_super_admin() )
-                $submenu['options-general.php'][45] = array(__('Miscellaneous'), 'manage_options', 'options-misc.php');
 
 $_wp_last_utility_menu = 80; // The index of the last top-level menu in the utility menu group