diff -r 46e08815594e -r 5a34101dfcf9 plugins/SpecialUserPrefs.php --- a/plugins/SpecialUserPrefs.php Wed Jul 29 11:49:30 2009 -0400 +++ b/plugins/SpecialUserPrefs.php Wed Jul 29 11:49:57 2009 -0400 @@ -116,7 +116,7 @@ userprefs_menu_add('usercp_sec_profile', 'usercp_sec_profile_emailpassword', makeUrlNS('Special', 'Preferences/EmailPassword') . '" onclick="ajaxLoginNavTo(\'Special\', \'Preferences/EmailPassword\', '.USER_LEVEL_CHPREF.'); return false;'); userprefs_menu_add('usercp_sec_profile', 'usercp_sec_profile_signature', makeUrlNS('Special', 'Preferences/Signature')); - userprefs_menu_add('usercp_sec_profile', 'usercp_sec_profile_publicinfo', makeUrlNS('Special', 'Preferences/Profile')); + // userprefs_menu_add('usercp_sec_profile', 'usercp_sec_profile_publicinfo', makeUrlNS('Special', 'Preferences/Profile')); userprefs_menu_add('usercp_sec_profile', 'usercp_sec_profile_usergroups', makeUrlNS('Special', 'Usergroups')); if ( getConfig('avatar_enable') == '1' ) { @@ -299,19 +299,6 @@ switch ( $section ) { - case 'Home': - global $email; - $userpage_id = $paths->nslist['User'] . sanitize_page_id($session->username); - $userpage_exists = ( isPage($userpage_id) ) ? '' : ' class="wikilink-nonexistent"'; - $user_page = makeUrlNS('User', sanitize_page_id($session->username)); - $site_admin = $email->encryptEmail(getConfig('contact_email'), '', '', $lang->get('usercp_intro_para3_admin_link')); - - echo '

' . $lang->get('usercp_intro_heading_main', array('username' => $session->username)) . '

'; - - echo '

' . $lang->get('usercp_intro_para1') . '

-

' . $lang->get('usercp_intro_para2', array('userpage_link' => $user_page)) . '

-

' . $lang->get('usercp_intro_para3', array('admin_contact_link' => $site_admin)) . '

'; - break; case 'EmailPassword': $errors = trim($errors); @@ -380,6 +367,18 @@ echo ''; break; case "Profile": + case 'Home': + + global $email; + $userpage_id = $paths->nslist['User'] . sanitize_page_id($session->username); + $userpage_exists = ( isPage($userpage_id) ) ? '' : ' class="wikilink-nonexistent"'; + $user_page = makeUrlNS('User', sanitize_page_id($session->username)); + $site_admin = $email->encryptEmail(getConfig('contact_email'), '', '', $lang->get('usercp_intro_para3_admin_link')); + + echo '

' . $lang->get('usercp_intro_heading_main', array('username' => $session->username)) . '

'; + + echo $lang->get('usercp_intro', array('userpage_link' => $user_page)); + $available_ranks = $session->get_user_possible_ranks($session->user_id); $current_rank = $session->get_user_rank($session->user_id);