WordPress.org
Get WordPress

Make WordPress Core

Changeset 3112


Ignore:
Timestamp:
11/16/2005 11:32:38 PM (19 years ago)
Author:
matt
Message:

Removing personal options, putting on profile page. Fixes #1557

Location:
trunk/wp-admin
Files:
2 deleted
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/admin-functions.php

    r3103 r3112  
    12771277
    12781278function add_options_page($page_title, $menu_title, $access_level, $file, $function = '') {
    1279     return add_submenu_page('options-personal.php', $page_title, $menu_title, $access_level, $file, $function);
     1279    return add_submenu_page('options-general.php', $page_title, $menu_title, $access_level, $file, $function);
    12801280}
    12811281

  • trunk/wp-admin/admin-header.php

    r3015 r3112  
    261261require(ABSPATH . '/wp-admin/menu-header.php');
    262262
    263 if ( $parent_file == 'options-personal.php' ) {
     263if ( $parent_file == 'options-general.php' ) {
    264264    require(ABSPATH . '/wp-admin/options-head.php');
    265265}

  • trunk/wp-admin/menu.php

    r2800 r3112  
    1515else
    1616    $menu[35] = array(__('Profile'), 'read', 'profile.php');
    17 $menu[40] = array(__('Options'), 'read', 'options-personal.php');
     17$menu[40] = array(__('Options'), 'read', 'options-general.php');
    1818$menu[45] = array(__('Import'), 'import', 'import.php');
    1919
    … …  
    4040$submenu['profile.php'][10] = array(__('Authors & Users'), 'edit_users', 'users.php');
    4141
    42 $submenu['options-personal.php'][5] = array(__('Personal'), 'read', 'options-personal.php');
    43 $submenu['options-personal.php'][10] = array(__('General'), 'manage_options', 'options-general.php');
    44 $submenu['options-personal.php'][15] = array(__('Writing'), 'manage_options', 'options-writing.php');
    45 $submenu['options-personal.php'][20] = array(__('Reading'), 'manage_options', 'options-reading.php');
    46 $submenu['options-personal.php'][25] = array(__('Discussion'), 'manage_options', 'options-discussion.php');
    47 $submenu['options-personal.php'][30] = array(__('Permalinks'), 'manage_options', 'options-permalink.php');
    48 $submenu['options-personal.php'][35] = array(__('Miscellaneous'), 'manage_options', 'options-misc.php');
     42$submenu['options-general.php'][10] = array(__('General'), 'manage_options', 'options-general.php');
     43$submenu['options-general.php'][15] = array(__('Writing'), 'manage_options', 'options-writing.php');
     44$submenu['options-general.php'][20] = array(__('Reading'), 'manage_options', 'options-reading.php');
     45$submenu['options-general.php'][25] = array(__('Discussion'), 'manage_options', 'options-discussion.php');
     46$submenu['options-general.php'][30] = array(__('Permalinks'), 'manage_options', 'options-permalink.php');
     47$submenu['options-general.php'][35] = array(__('Miscellaneous'), 'manage_options', 'options-misc.php');
    4948
    5049$submenu['plugins.php'][5] = array(__('Plugins'), 'activate_plugins', 'plugins.php');

  • trunk/wp-admin/options-discussion.php

    r3054 r3112  
    33
    44$title = __('Discussion Options');
    5 $parent_file = 'options-personal.php';
     5$parent_file = 'options-general.php';
    66
    77include('admin-header.php');

  • trunk/wp-admin/options-general.php

    r3058 r3112  
    33
    44$title = __('General Options');
    5 $parent_file = 'options-personal.php';
     5$parent_file = 'options-general.php';
    66
    77include('admin-header.php');

  • trunk/wp-admin/options-misc.php

    r3054 r3112  
    33
    44$title = __('Miscellaneous Options');
    5 $parent_file = 'options-personal.php';
     5$parent_file = 'options-general.php';
    66
    77include('admin-header.php');

  • trunk/wp-admin/options-permalink.php

    r3029 r3112  
    33
    44$title = __('Permalink Options');
    5 $parent_file = 'options-personal.php';
     5$parent_file = 'options-general.php';
    66
    77function add_js() {

  • trunk/wp-admin/options-reading.php

    r3054 r3112  
    33
    44$title = __('Reading Options');
    5 $parent_file = 'options-personal.php';
     5$parent_file = 'options-general.php';
    66
    77include('admin-header.php');

  • trunk/wp-admin/options-writing.php

    r3054 r3112  
    33
    44$title = __('Writing Options');
    5 $parent_file = 'options-personal.php';
     5$parent_file = 'options-general.php';
    66
    77include('admin-header.php');

  • trunk/wp-admin/profile-update.php

    r2889 r3112  
    44
    55check_admin_referer();
     6
     7if ( !$_POST )
     8    die( __('No post?') );
    69
    710$errors = edit_user($user_ID);
    … …  
    1417}
    1518
     19if ( !isset( $_POST['rich_editing'] ) )
     20    $_POST['rich_editing'] = 'false';
     21update_user_option( $current_user->id, 'rich_editing', $_POST['rich_editing'], true );
     22
     23do_action('personal_options_update');
     24
    1625if ( 'profile' == $_POST['from'] )
    1726    $to = 'profile.php?updated=true';

  • trunk/wp-admin/profile.php

    r3102 r3112  
    106106
    107107<br clear="all" />
     108
     109<h3><?php _e('Personal Options'); ?></h3>
     110
     111<p><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="true" <?php checked('true', get_user_option('rich_editing')); ?> />
     112<?php _e('Use the visual rich editor when writing') ?></label></p>
     113
     114<?php do_action('profile_personal_options'); ?>
     115
    108116  <table width="99%"  border="0" cellspacing="2" cellpadding="3" class="editform">
    109117    <?php
Note: See TracChangeset for help on using the changeset viewer.