10 år sedan · a686226858
--- a/Sources/Load.php
+++ b/Sources/Load.php
@@ -946,9 +946,9 @@ function loadMemberData($users, $is_name = false, $set = 'normal')
 
 	// Used by default
 
 	$select_columns = '
 
 			IFNULL(lo.log_time, 0) AS is_online, IFNULL(a.id_attach, 0) AS id_attach, a.filename, a.attachment_type,
 
-			mem.signature, mem.personal_text, mem.location, mem.gender, mem.avatar, mem.id_member, mem.member_name,
 
+			mem.signature, mem.personal_text, mem.avatar, mem.id_member, mem.member_name,
 
 			mem.real_name, mem.email_address, mem.hide_email, mem.date_registered, mem.website_title, mem.website_url,
 
-			mem.birthdate, mem.member_ip, mem.member_ip2, mem.icq, mem.aim, mem.yim, mem.skype, mem.posts, mem.last_login,
 
+			mem.birthdate, mem.member_ip, mem.member_ip2, mem.posts, mem.last_login,
 
 			mem.karma_good, mem.id_post_group, mem.karma_bad, mem.lngfile, mem.id_group, mem.time_offset, mem.show_online,
 
 			mg.online_color AS member_group_color, IFNULL(mg.group_name, {string:blank_string}) AS member_group,
 
 			pg.online_color AS post_group_color, IFNULL(pg.group_name, {string:blank_string}) AS post_group,
@@ -1121,10 +1121,8 @@ function loadMemberContext($user, $display_custom_fields = false)
 
 	// Censor everything.
 
 	censorText($profile['signature']);
 
 	censorText($profile['personal_text']);
 
-	censorText($profile['location']);
 
 
 
 	// Set things up to be used before hand.
 
-	$gendertxt = $profile['gender'] == 2 ? $txt['female'] : ($profile['gender'] == 1 ? $txt['male'] : '');
 
 	$profile['signature'] = str_replace(array("\n", "\r"), array('<br>', ''), $profile['signature']);
 
 	$profile['signature'] = parse_bbc($profile['signature'], true, 'sig' . $profile['id_member']);
 
 
@@ -1158,41 +1156,12 @@ function loadMemberContext($user, $display_custom_fields = false)
 
 			'buddies' => $buddy_list,
 
 			'title' => !empty($modSettings['titlesEnable']) ? $profile['usertitle'] : '',
 
 			'blurb' => $profile['personal_text'],
 
-			'gender' => array(
 
-				'name' => $gendertxt,
 
-				'image' => !empty($profile['gender']) ? '<span class="generic_icons ' . ($profile['gender'] == 1 ? 'gender_male' : 'gender_female') . '" title="' . $gendertxt . '"></span>' : ''
 
-			),
 
 			'website' => array(
 
 				'title' => $profile['website_title'],
 
 				'url' => $profile['website_url'],
 
 			),
 
 			'birth_date' => empty($profile['birthdate']) || $profile['birthdate'] === '0001-01-01' ? '0000-00-00' : (substr($profile['birthdate'], 0, 4) === '0004' ? '0000' . substr($profile['birthdate'], 4) : $profile['birthdate']),
 
 			'signature' => $profile['signature'],
 
-			'location' => $profile['location'],
 
-			'icq' => $profile['icq'] != '' && !$user_info['is_guest'] ? array(
 
-				'name' => $profile['icq'],
 
-				'href' => 'http://www.icq.com/whitepages/about_me.php?uin=' . $profile['icq'],
 
-				'link' => '<a class="icq new_win" href="http://www.icq.com/whitepages/about_me.php?uin=' . $profile['icq'] . '" target="_blank" title="' . $txt['icq_title'] . ' - ' . $profile['icq'] . '"><img src="' . $settings['images_url'] . '/icq.png" alt="' . $txt['icq'] . ' - ' . $profile['icq'] . '"></a>',
 
-				'link_text' => '<a class="icq extern" href="http://www.icq.com/whitepages/about_me.php?uin=' . $profile['icq'] . '" title="' . $txt['icq_title'] . ' - ' . $profile['icq'] . '">' . $profile['icq'] . '</a>',
 
-			) : array('name' => '', 'add' => '', 'href' => '', 'link' => '', 'link_text' => ''),
 
-			'aim' => $profile['aim'] != '' && !$user_info['is_guest'] ? array(
 
-				'name' => $profile['aim'],
 
-				'href' => 'aim:goim?screenname=' . urlencode(strtr($profile['aim'], array(' ' => '%20'))) . '&amp;message=' . $txt['aim_default_message'],
 
-				'link' => '<a class="aim" href="aim:goim?screenname=' . urlencode(strtr($profile['aim'], array(' ' => '%20'))) . '&amp;message=' . $txt['aim_default_message'] . '" title="' . $txt['aim_title'] . ' - ' . $profile['aim'] . '"><img src="' . $settings['images_url'] . '/aim.png" alt="' . $txt['aim_title'] . ' - ' . $profile['aim'] . '"></a>',
 
-				'link_text' => '<a class="aim" href="aim:goim?screenname=' . urlencode(strtr($profile['aim'], array(' ' => '%20'))) . '&amp;message=' . $txt['aim_default_message'] . '" title="' . $txt['aim_title'] . ' - ' . $profile['aim'] . '">' . $profile['aim'] . '</a>'
 
-			) : array('name' => '', 'href' => '', 'link' => '', 'link_text' => ''),
 
-			'yim' => $profile['yim'] != '' && !$user_info['is_guest'] ? array(
 
-				'name' => $profile['yim'],
 
-				'href' => 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($profile['yim']),
 
-				'link' => '<a class="yim" href="http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($profile['yim']) . '" title="' . $txt['yim_title'] . ' - ' . $profile['yim'] . '"><img src="' . $settings['images_url'] . '/yahoo.png" alt="' . $txt['yim_title'] . ' - ' . $profile['yim'] . '"></a>',
 
-				'link_text' => '<a class="yim" href="http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($profile['yim']) . '" title="' . $txt['yim_title'] . ' - ' . $profile['yim'] . '">' . $profile['yim'] . '</a>'
 
-			) : array('name' => '', 'href' => '', 'link' => '', 'link_text' => ''),
 
-			'skype' => !empty($profile['skype']) && !$user_info['is_guest'] ? array(
 
-				'name' => $profile['skype'],
 
-				'href' => 'skype:' . $profile['skype'] . '?chat',
 
-				'link' => '<a class="skype new_win" href="skype:' . $profile['skype'] . '?chat" title="' . $txt['skype'] . ' - ' . $profile['skype'] . '"><img src="' . $settings['images_url'] . '/skype.png" alt="' . $txt['skype'] . ' - ' . $profile['skype'] . '"></a>',
 
-				'link_text' => '<a class="skype new_win" href="skype:' . $profile['skype'] . '?chat" title="' . $txt['skype'] . ' - ' . $profile['skype'] . '">' . $profile['skype'] . '</a>',
 
-			) : array('name' => '', 'href' => '', 'link' => '', 'link_text' => '',),
 
 			'real_posts' => $profile['posts'],
 
 			'posts' => $profile['posts'] > 500000 ? $txt['geek'] : comma_format($profile['posts']),
 
 			'avatar' => array(
@@ -1236,17 +1205,6 @@ function loadMemberContext($user, $display_custom_fields = false)
 
 			'local_time' => timeformat(time() + ($profile['time_offset'] - $user_info['time_offset']) * 3600, false),
 
 		);
 
 
 
-	// First do a quick run through to make sure there is something to be shown.
 
-	$memberContext[$user]['has_messenger'] = false;
 
-	foreach (array('icq', 'skype', 'aim', 'yim') as $messenger)
 
-	{
 
-		if (!isset($context['disabled_fields'][$messenger]) && !empty($memberContext[$user][$messenger]['link']))
 
-		{
 
-			$memberContext[$user]['has_messenger'] = true;
 
-			break;
 
-		}
 
-	}
 
-
 
 	// Are we also loading the members custom fields into context?
 
 	if ($display_custom_fields && !empty($modSettings['displayFields']))
 
 	{
@@ -1982,7 +1940,7 @@ function loadTemplate($template_name, $style_sheets = array(), $fatal = true)
 
 			loadLanguage('Errors');
 
 			echo '
 
 <div class="alert errorbox">
 
-	<a href="', $scripturl . '?action=admin;area=theme;sa=list;th=1;' . $context['session_var'] . '=' . $context['session_id'], '" class="alert">', $txt['theme_dir_wrong'], '</a>
 
+	<a href="', $scripturl . '?action=admin;area=theme;sa=list;' . $context['session_var'] . '=' . $context['session_id'], '" class="alert">', $txt['theme_dir_wrong'], '</a>
 
 </div>';
 
 		}
 
 
--- a/Sources/ManageMembers.php
+++ b/Sources/ManageMembers.php
@@ -235,11 +235,6 @@ function ViewMemberlist()
 
 				'type' => 'date',
 
 				'range' => true
 
 			),
 
-			'gender' => array(
 
-				'db_fields' => array('gender'),
 
-				'type' => 'checkbox',
 
-				'values' => array('0', '1', '2'),
 
-			),
 
 			'activated' => array(
 
 				'db_fields' => array('CASE WHEN is_activated IN (1, 11) THEN 1 ELSE 0 END'),
 
 				'type' => 'checkbox',
@@ -257,17 +252,9 @@ function ViewMemberlist()
 
 				'db_fields' => array('website_title', 'website_url'),
 
 				'type' => 'string'
 
 			),
 
-			'location' => array(
 
-				'db_fields' => array('location'),
 
-				'type' => 'string'
 
-			),
 
 			'ip' => array(
 
 				'db_fields' => array('member_ip'),
 
 				'type' => 'string'
 
-			),
 
-			'messenger' => array(
 
-				'db_fields' => array('icq', 'aim', 'yim', 'skype'),
 
-				'type' => 'string'
 
 			)
 
 		);
 
 		$range_trans = array(
--- a/Sources/ManageSettings.php
+++ b/Sources/ManageSettings.php
@@ -1127,7 +1127,7 @@ function ShowCustomProfiles()
 
 	$context['sub_template'] = 'show_custom_profile';
 
 
 
 	// What about standard fields they can tweak?
 
-	$standard_fields = array('icq', 'aim', 'yim', 'skype', 'location', 'gender', 'website', 'personal_text', 'posts', 'warning_status');
 
+	$standard_fields = array('website', 'personal_text', 'posts', 'warning_status');
 
 	// What fields can't you put on the registration page?
 
 	$context['fields_no_registration'] = array('posts', 'warning_status');
 
 
@@ -1369,7 +1369,7 @@ function list_getProfileFields($start, $items_per_page, $sort, $standardFields)
 
 
 
 	if ($standardFields)
 
 	{
 
-		$standard_fields = array('icq', 'aim', 'yim', 'skype', 'location', 'gender', 'website', 'personal_text', 'posts', 'warning_status');
 
+		$standard_fields = array('website', 'personal_text', 'posts', 'warning_status');
 
 		$fields_no_registration = array('posts', 'warning_status');
 
 		$disabled_fields = isset($modSettings['disabled_profile_fields']) ? explode(',', $modSettings['disabled_profile_fields']) : array();
 
 		$registration_fields = isset($modSettings['registration_fields']) ? explode(',', $modSettings['registration_fields']) : array();
--- a/Sources/Memberlist.php
+++ b/Sources/Memberlist.php
@@ -83,34 +83,6 @@ function Memberlist()
 
 				'up' => 'LENGTH(mem.website_url) > 0 DESC, IFNULL(mem.website_url, 1=1) ASC, mem.website_url ASC'
 
 			),
 
 		),
 
-		'icq' => array(
 
-			'label' => $txt['icq'],
 
-			'sort' => array(
 
-				'down' => 'LENGTH(mem.icq) > 0 ASC, mem.icq = 0 DESC, mem.icq DESC',
 
-				'up' => 'LENGTH(mem.icq) > 0 DESC, mem.icq = 0 ASC, mem.icq ASC'
 
-			),
 
-		),
 
-		'aim' => array(
 
-			'label' => $txt['aim'],
 
-			'sort' => array(
 
-				'down' => 'LENGTH(mem.aim) > 0 ASC, IFNULL(mem.aim, 1=1) DESC, mem.aim DESC',
 
-				'up' => 'LENGTH(mem.aim) > 0 DESC, IFNULL(mem.aim, 1=1) ASC, mem.aim ASC'
 
-			),
 
-		),
 
-		'yim' => array(
 
-			'label' => $txt['yim'],
 
-			'sort' => array(
 
-				'down' => 'LENGTH(mem.yim) > 0 ASC, IFNULL(mem.yim, 1=1) DESC, mem.yim DESC',
 
-				'up' => 'LENGTH(mem.yim) > 0 DESC, IFNULL(mem.yim, 1=1) ASC, mem.yim ASC'
 
-			),
 
-		),
 
-		'skype' => array(
 
-			'label' => $txt['skype'],
 
-			'sort' => array(
 
-				'down' => 'LENGTH(mem.skype) > 0 ASC, IFNULL(mem.skype, 1=1) DESC, mem.skype DESC',
 
-				'up' => 'LENGTH(mem.skype) > 0 DESC, IFNULL(mem.skype, 1=1) ASC, mem.skype ASC',
 
-			),
 
-		),
 
 		'id_group' => array(
 
 			'label' => $txt['position'],
 
 			'sort' => array(
@@ -468,9 +440,7 @@ function MLSearch()
 
 			$fields = allowedTo('moderate_forum') ? array('member_name', 'real_name') : array('real_name');
 
 		else
 
 			$fields = array();
 
-		// Search for messengers...
 
-		if (in_array('messenger', $_POST['fields']) && !$user_info['is_guest'])
 
-			$fields += array(3 => 'aim', 'icq', 'yim', 'skype');
 
+
 
 		// Search for websites.
 
 		if (in_array('website', $_POST['fields']))
 
 			$fields += array(7 => 'website_title', 'website_url');
@@ -545,7 +515,6 @@ function MLSearch()
 
 		$context['search_fields'] = array(
 
 			'name' => $txt['mlist_search_name'],
 
 			'email' => $txt['mlist_search_email'],
 
-			'messenger' => $txt['mlist_search_messenger'],
 
 			'website' => $txt['mlist_search_website'],
 
 			'group' => $txt['mlist_search_group'],
 
 		);
--- a/Sources/News.php
+++ b/Sources/News.php
@@ -924,20 +924,9 @@ function getXmlProfile($xml_format)
 
 			$data['signature'] = cdata_parse($profile['signature']);
 
 		if ($profile['blurb'] != '')
 
 			$data['blurb'] = cdata_parse($profile['blurb']);
 
-		if ($profile['location'] != '')
 
-			$data['location'] = cdata_parse($profile['location']);
 
 		if ($profile['title'] != '')
 
 			$data['title'] = cdata_parse($profile['title']);
 
 
 
-		if (!empty($profile['icq']['name']) && !$user_info['is_guest'])
 
-			$data['icq'] = $profile['icq']['name'];
 
-		if ($profile['aim']['name'] != '' && !$user_info['is_guest'])
 
-			$data['aim'] = $profile['aim']['name'];
 
-		if ($profile['yim']['name'] != '' && !$user_info['is_guest'])
 
-			$data['yim'] = $profile['yim']['name'];
 
-		if (!empty($profile['skype']['name']) && !$user_info['is_guest'])
 
-			$data['skype'] = $profile['skype']['name'];
 
-
 
 		if ($profile['website']['title'] != '')
 
 			$data['website'] = array(
 
 				'title' => cdata_parse($profile['website']['title']),
--- a/Sources/PackageGet.php
+++ b/Sources/PackageGet.php
@@ -170,6 +170,12 @@ function PackageServers()
 
 			$ftp->close();
 
 		}
 
 	}
 
+
 
+	addInlineJavascript('
 
+	$(\'.new_package_content\').hide();
 
+	$(\'.download_new_package\').on(\'click\', function() {
 
+		$(\'.new_package_content\').css(\'display\') == \'none\' ? $(\'.new_package_content\').show(\'slow\') : $(\'.new_package_content\').hide(\'slow\'); 
 
+	});', true);
 
 }
 
 
 
 /**
--- a/Sources/Profile-Modify.php
+++ b/Sources/Profile-Modify.php
@@ -73,21 +73,6 @@ function loadProfileFields($force_reload = false)
 
 	*/
 
 
 
 	$profile_fields = array(
 
-		'aim' => array(
 
-			'type' => 'text',
 
-			'label' => $txt['aim'],
 
-			'subtext' => $txt['your_aim'],
 
-			'size' => 24,
 
-			'value' => strtr(empty($cur_profile['aim']) ? '' : $cur_profile['aim'], '+', ' '),
 
-			'permission' => 'profile_extra',
 
-			'input_validate' => create_function('&$value', '
 
-				$value = strtr($value, \' \', \'+\');
 
-				if (strlen($value) > 32)
 
-					return \'aim_too_long\';
 
-
 
-				return true;
 
-			'),
 
-		),
 
 		'avatar_choice' => array(
 
 			'type' => 'callback',
 
 			'callback_func' => 'avatar_select',
@@ -211,13 +196,6 @@ function loadProfileFields($force_reload = false)
 
 				return $isValid;
 
 			'),
 
 		),
 
-		'gender' => array(
 
-			'type' => 'select',
 
-			'cast_type' => 'int',
 
-			'options' => 'return array(0 => \'\', 1 => $txt[\'male\'], 2 => $txt[\'female\']);',
 
-			'label' => $txt['gender'],
 
-			'permission' => 'profile_extra',
 
-		),
 
 		'hide_email' => array(
 
 			'type' => 'check',
 
 			'value' => empty($cur_profile['hide_email']) ? true : false,
@@ -229,21 +207,6 @@ function loadProfileFields($force_reload = false)
 
 				return true;
 
 			'),
 
 		),
 
-		'icq' => array(
 
-			'type' => 'text',
 
-			'label' => $txt['icq'],
 
-			'subtext' => $txt['your_icq'],
 
-			'size' => 24,
 
-			'permission' => 'profile_extra',
 
-			// Need to make sure ICQ doesn't equal 0.
 
-			'input_validate' => create_function('&$value', '
 
-				if (empty($value))
 
-					$value = \'\';
 
-				else
 
-					$value = (int) $value;
 
-				return true;
 
-			'),
 
-		),
 
 		// Selecting group membership is a complicated one so we treat it separate!
 
 		'id_group' => array(
 
 			'type' => 'callback',
@@ -338,13 +301,6 @@ function loadProfileFields($force_reload = false)
 
 				}
 
 			'),
 
 		),
 
-		'location' => array(
 
-			'type' => 'text',
 
-			'label' => $txt['location'],
 
-			'log_change' => true,
 
-			'size' => 50,
 
-			'permission' => 'profile_other',
 
-		),
 
 		// The username is not always editable - so adjust it as such.
 
 		'member_name' => array(
 
 			'type' => allowedTo('admin_forum') && isset($_GET['changeusername']) ? 'text' : 'label',
@@ -378,13 +334,6 @@ function loadProfileFields($force_reload = false)
 
 				return false;
 
 			'),
 
 		),
 
-		'skype' => array(
 
-			'type' => 'text',
 
-			'label' => $txt['skype'],
 
-			'subtext' => $txt['skype_username'],
 
-			'size' => 24,
 
-			'permission' => 'profile_extra',
 
-		),
 
 		'passwrd1' => array(
 
 			'type' => 'password',
 
 			'label' => ucwords($txt['choose_pass']),
@@ -679,14 +628,6 @@ function loadProfileFields($force_reload = false)
 
 			'),
 
 			'link_with' => 'website',
 
 		),
 
-		'yim' => array(
 
-			'type' => 'text',
 
-			'label' => $txt['yim'],
 
-			'subtext' => $txt['your_yim'],
 
-			'size' => 24,
 
-			'input_attr' => array('maxlength="32"'),
 
-			'permission' => 'profile_extra',
 
-		),
 
 	);
 
 
 
 	call_integration_hook('integrate_load_profile_fields', array(&$profile_fields));
@@ -1680,9 +1621,7 @@ function forumProfile($memID)
 
 	setupProfileContext(
 
 		array(
 
 			'avatar_choice', 'hr', 'personal_text', 'hr',
 
-			'bday1', 'location', 'gender', 'hr',
 
-			'icq', 'aim', 'yim', 'skype', 'hr',
 
-			'usertitle', 'signature', 'hr',
 
+			'bday1', 'usertitle', 'signature', 'hr',
 
 			'karma_good', 'hr',
 
 			'website_title', 'website_url',
 
 		)
--- a/Sources/Recent.php
+++ b/Sources/Recent.php
@@ -1016,6 +1016,7 @@ function UnreadTopics()
 
 				SELECT t.id_topic, t.id_board, t.id_last_msg, IFNULL(lmr.id_msg, 0) AS id_msg' . (!in_array($_REQUEST['sort'], array('t.id_last_msg', 't.id_topic')) ? ', ' . $_REQUEST['sort'] . ' AS sort_key' : '') . '
 
 				FROM {db_prefix}messages AS m
 
 					INNER JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)
 
+					LEFT JOIN {db_prefix}log_topics_unread AS lt ON (lt.id_topic = t.id_topic)
 
 					LEFT JOIN {db_prefix}log_mark_read AS lmr ON (lmr.id_board = t.id_board AND lmr.id_member = {int:current_member})' . (isset($sortKey_joins[$_REQUEST['sort']]) ? $sortKey_joins[$_REQUEST['sort']] : '') . '
 
 				WHERE m.id_member = {int:current_member}' . (!empty($board) ? '
 
 					AND t.id_board = {int:current_board}' : '') . ($modSettings['postmod_active'] ? '
--- a/Sources/Register.php
+++ b/Sources/Register.php
@@ -325,16 +325,6 @@ function Register2($verifiedOpenID = false)
 
 	{
 
 		$reg_fields = explode(',', $modSettings['registration_fields']);
 
 
 
-		// Easy string fields first.
 
-		foreach (array('skype', 'aim', 'yim', 'location') as $field)
 
-			if (in_array($field, $reg_fields))
 
-				$possible_strings[] = $field;
 
-
 
-		// Then the easy numeric fields.
 
-		foreach (array('icq', 'gender') as $field)
 
-			if (in_array($field, $reg_fields))
 
-				$possible_ints[] = $field;
 
-
 
 		// Website is a little different
 
 		if (in_array('website', $reg_fields))
 
 			$possible_strings += array('website_url', 'website_title');
--- a/Sources/Subs-Members.php
+++ b/Sources/Subs-Members.php
@@ -625,11 +625,6 @@ function registerMember(&$regOptions, $return_errors = false)
 
 		'pm_ignore_list' => '',
 
 		'website_title' => '',
 
 		'website_url' => '',
 
-		'location' => '',
 
-		'icq' => '',
 
-		'aim' => '',
 
-		'yim' => '',
 
-		'skype' => '',
 
 		'time_format' => '',
 
 		'signature' => '',
 
 		'avatar' => '',
@@ -684,10 +679,6 @@ function registerMember(&$regOptions, $return_errors = false)
 
 			$regOptions['register_vars']['id_group'] = 0;
 
 	}
 
 
 
-	// ICQ cannot be zero.
 
-	if (isset($regOptions['extra_register_vars']['icq']) && empty($regOptions['extra_register_vars']['icq']))
 
-		$regOptions['extra_register_vars']['icq'] = '';
 
-
 
 	// Integrate optional member settings to be set.
 
 	if (!empty($regOptions['extra_register_vars']))
 
 		foreach ($regOptions['extra_register_vars'] as $var => $value)
@@ -702,7 +693,7 @@ function registerMember(&$regOptions, $return_errors = false)
 
 	// Right, now let's prepare for insertion.
 
 	$knownInts = array(
 
 		'date_registered', 'posts', 'id_group', 'last_login', 'instant_messages', 'unread_messages',
 
-		'new_pm', 'pm_prefs', 'gender', 'hide_email', 'show_online', 'pm_email_notify', 'karma_good', 'karma_bad',
 
+		'new_pm', 'pm_prefs', 'hide_email', 'show_online', 'pm_email_notify', 'karma_good', 'karma_bad',
 
 		'notify_announcements', 'notify_send_body', 'notify_regularity', 'notify_types',
 
 		'id_theme', 'is_activated', 'id_msg_last_visit', 'id_post_group', 'total_time_logged_in', 'warning',
 
 	);
@@ -1320,7 +1311,7 @@ function list_getMembers($start, $items_per_page, $sort, $where, $where_params =
 
 
 
 	$request = $smcFunc['db_query']('', '
 
 		SELECT
 
-			mem.id_member, mem.member_name, mem.real_name, mem.email_address, mem.icq, mem.aim, mem.yim, mem.skype, mem.member_ip, mem.member_ip2, mem.last_login,
 
+			mem.id_member, mem.member_name, mem.real_name, mem.email_address, mem.member_ip, mem.member_ip2, mem.last_login,
 
 			mem.posts, mem.is_activated, mem.date_registered, mem.id_group, mem.additional_groups, mg.group_name
 
 		FROM {db_prefix}members AS mem
 
 			LEFT JOIN {db_prefix}membergroups AS mg ON (mg.id_group = mem.id_group)
--- a/Themes/default/ManageMembers.template.php
+++ b/Themes/default/ManageMembers.template.php
@@ -116,36 +116,16 @@ function template_search_members()
 
 								<dd>
 
 									<input type="url" name="website" id="website" value="" class="input_text">
 
 								</dd>
 
-								<dt class="righttext">
 
-									<strong><label for="location">', $txt['location'], ':</label></strong>
 
-								</dt>
 
-								<dd>
 
-									<input type="text" name="location" id="location" value="" class="input_text">
 
-								</dd>
 
 								<dt class="righttext">
 
 									<strong><label for="ip">', $txt['ip_address'], ':</label></strong>
 
 								</dt>
 
 								<dd>
 
 									<input type="text" name="ip" id="ip" value="" class="input_text">
 
 								</dd>
 
-								<dt class="righttext">
 
-									<strong><label for="messenger">', $txt['messenger_address'], ':</label></strong>
 
-								</dt>
 
-								<dd>
 
-									<input type="text" name="messenger" id="messenger" value="" class="input_text">
 
-								</dd>
 
 							</dl>
 
 						</div>
 
 					</div>
 
 					<div class="flow_hidden">
 
-						<div class="msearch_details floatleft">
 
-							<fieldset>
 
-								<legend>', $txt['gender'], '</legend>
 
-								<label for="gender-0"><input type="checkbox" name="gender[]" value="0" id="gender-0" checked class="input_check"> ', $txt['undefined_gender'], '</label>&nbsp;&nbsp;
 
-								<label for="gender-1"><input type="checkbox" name="gender[]" value="1" id="gender-1" checked class="input_check"> ', $txt['male'], '</label>&nbsp;&nbsp;
 
-								<label for="gender-2"><input type="checkbox" name="gender[]" value="2" id="gender-2" checked class="input_check"> ', $txt['female'], '</label>
 
-							</fieldset>
 
-						</div>
 
 						<div class="msearch_details floatright">
 
 							<fieldset>
 
 								<legend>', $txt['activation_status'], '</legend>
--- a/Themes/default/Memberlist.template.php
+++ b/Themes/default/Memberlist.template.php
@@ -77,26 +77,6 @@ function template_main()
 
 			echo '
 
 					<td class="centertext">', $member['website']['url'] != '' ? '<a href="' . $member['website']['url'] . '" target="_blank" class="new_win"><span class="generic_icons www" title="' . $member['website']['title'] . '"></span></a>' : '', '</td>';
 
 
 
-		// ICQ?
 
-		if (!isset($context['disabled_fields']['icq']))
 
-			echo '
 
-					<td class="centertext">', $member['icq']['link'], '</td>';
 
-
 
-		// AIM?
 
-		if (!isset($context['disabled_fields']['aim']))
 
-			echo '
 
-					<td class="centertext">', $member['aim']['link'], '</td>';
 
-
 
-		// YIM?
 
-		if (!isset($context['disabled_fields']['yim']))
 
-			echo '
 
-					<td class="centertext">', $member['yim']['link'], '</td>';
 
-
 
-		// Skype?
 
-		if (!isset($context['disabled_fields']['skype']))
 
-			echo '
 
-					<td class="centertext">', $member['skype']['link'], '</td>';
 
-
 
 		// Group and date.
 
 		echo '
 
 					<td class="lefttext">', empty($member['group']) ? $member['post_group'] : $member['group'], '</td>
--- a/Themes/default/Packages.template.php
+++ b/Themes/default/Packages.template.php
@@ -690,139 +690,141 @@ function template_servers()
 
 	echo '
 
 	<div id="admin_form_wrapper">
 
 		<div class="cat_bar">
 
-			<h3 class="catbg">', $txt['download_new_package'], '</h3>
 
-		</div>';
 
-
 
-	if ($context['package_download_broken'])
 
-	{
 
-		echo '
 
-		<div class="cat_bar">
 
-			<h3 class="catbg">', $txt['package_ftp_necessary'], '</h3>
 
+			<h3 class="catbg">' . $txt['package_upload_title'] . '</h3>
 
 		</div>
 
 		<div class="windowbg">
 
 			<div class="content">
 
-				<p>
 
-					', $txt['package_ftp_why_download'], '
 
-				</p>
 
-				<form action="', $scripturl, '?action=admin;area=packages;get" method="post" accept-charset="', $context['character_set'], '">
 
+				<form action="' . $scripturl . '?action=admin;area=packages;get;sa=upload" method="post" accept-charset="', $context['character_set'], '" enctype="multipart/form-data" style="margin-bottom: 0;">
 
 					<dl class="settings">
 
 						<dt>
 
-							<label for="ftp_server">', $txt['package_ftp_server'], ':</label>
 
-						</dt>
 
-						<dd>
 
-							<input type="text" size="30" name="ftp_server" id="ftp_server" value="', $context['package_ftp']['server'], '" class="input_text">
 
-							<label for="ftp_port">', $txt['package_ftp_port'], ':&nbsp;</label> <input type="text" size="3" name="ftp_port" id="ftp_port" value="', $context['package_ftp']['port'], '" class="input_text">
 
-						</dd>
 
-						<dt>
 
-							<label for="ftp_username">', $txt['package_ftp_username'], ':</label>
 
-						</dt>
 
-						<dd>
 
-							<input type="text" size="50" name="ftp_username" id="ftp_username" value="', $context['package_ftp']['username'], '" style="width: 99%;" class="input_text">
 
-						</dd>
 
-						<dt>
 
-							<label for="ftp_password">', $txt['package_ftp_password'], ':</label>
 
-						</dt>
 
-						<dd>
 
-							<input type="password" size="50" name="ftp_password" id="ftp_password" style="width: 99%;" class="input_password">
 
-						</dd>
 
-						<dt>
 
-							<label for="ftp_path">', $txt['package_ftp_path'], ':</label>
 
+							<strong>' . $txt['package_upload_select'] . ':</strong>
 
 						</dt>
 
 						<dd>
 
-							<input type="text" size="50" name="ftp_path" id="ftp_path" value="', $context['package_ftp']['path'], '" style="width: 99%;" class="input_text">
 
+							<input type="file" name="package" size="38" class="input_file">
 
 						</dd>
 
 					</dl>
 
-					<div class="righttext">
 
-						<input type="submit" value="', $txt['package_proceed'], '" class="button_submit">
 
-					</div>
 
+					<hr class="hrcolor">
 
+					<input type="submit" value="' . $txt['package_upload'] . '" class="button_submit">
 
+					<input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '">
 
 				</form>
 
 			</div>
 
-		</div>';
 
-	}
 
+		</div>
 
+		<br>
 
+		<div class="cat_bar">
 
+			<h3 class="catbg"><a class="download_new_package">', $txt['download_new_package'], '</a></h3>
 
+		</div>
 
+		<div class="new_package_content">';
 
 
 
-	echo '
 
-		<div class="windowbg2">
 
-			<div class="content">
 
-				<fieldset>
 
-					<legend>' . $txt['package_servers'] . '</legend>
 
-					<ul class="package_servers">';
 
-	foreach ($context['servers'] as $server)
 
+	if ($context['package_download_broken'])
 
+	{
 
 		echo '
 
-						<li class="flow_auto">
 
-							<span class="floatleft">' . $server['name'] . '</span>
 
-							<span class="package_server floatright"><a href="' . $scripturl . '?action=admin;area=packages;get;sa=remove;server=' . $server['id'] . ';', $context['session_var'], '=', $context['session_id'], '">[ ' . $txt['delete'] . ' ]</a></span>
 
-							<span class="package_server floatright"><a href="' . $scripturl . '?action=admin;area=packages;get;sa=browse;server=' . $server['id'] . '">[ ' . $txt['package_browse'] . ' ]</a></span>
 
-						</li>';
 
-	echo '
 
-					</ul>
 
-				</fieldset>
 
-				<fieldset>
 
-					<legend>' . $txt['add_server'] . '</legend>
 
-					<form action="' . $scripturl . '?action=admin;area=packages;get;sa=add" method="post" accept-charset="', $context['character_set'], '">
 
+			<div class="cat_bar">
 
+				<h3 class="catbg">', $txt['package_ftp_necessary'], '</h3>
 
+			</div>
 
+			<div class="windowbg">
 
+				<div class="content">
 
+					<p>
 
+						', $txt['package_ftp_why_download'], '
 
+					</p>
 
+					<form action="', $scripturl, '?action=admin;area=packages;get" method="post" accept-charset="', $context['character_set'], '">
 
 						<dl class="settings">
 
 							<dt>
 
-								<strong>' . $txt['server_name'] . ':</strong>
 
+								<label for="ftp_server">', $txt['package_ftp_server'], ':</label>
 
 							</dt>
 
 							<dd>
 
-								<input type="text" name="servername" size="44" value="SMF" class="input_text">
 
+								<input type="text" size="30" name="ftp_server" id="ftp_server" value="', $context['package_ftp']['server'], '" class="input_text">
 
+								<label for="ftp_port">', $txt['package_ftp_port'], ':&nbsp;</label> <input type="text" size="3" name="ftp_port" id="ftp_port" value="', $context['package_ftp']['port'], '" class="input_text">
 
 							</dd>
 
 							<dt>
 
-								<strong>' . $txt['serverurl'] . ':</strong>
 
+								<label for="ftp_username">', $txt['package_ftp_username'], ':</label>
 
 							</dt>
 
 							<dd>
 
-								<input type="text" name="serverurl" size="44" value="http://" class="input_text">
 
+								<input type="text" size="50" name="ftp_username" id="ftp_username" value="', $context['package_ftp']['username'], '" style="width: 99%;" class="input_text">
 
 							</dd>
 
-						</dl>
 
-						<div class="righttext">
 
-							<input type="submit" value="' . $txt['add_server'] . '" class="button_submit">
 
-							<input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '">
 
-						</div>
 
-					</form>
 
-				</fieldset>
 
-				<fieldset>
 
-					<legend>', $txt['package_download_by_url'], '</legend>
 
-					<form action="', $scripturl, '?action=admin;area=packages;get;sa=download;byurl;', $context['session_var'], '=', $context['session_id'], '" method="post" accept-charset="', $context['character_set'], '">
 
-						<dl class="settings">
 
 							<dt>
 
-								<strong>' . $txt['serverurl'] . ':</strong>
 
+								<label for="ftp_password">', $txt['package_ftp_password'], ':</label>
 
 							</dt>
 
 							<dd>
 
-								<input type="text" name="package" size="44" value="http://" class="input_text">
 
+								<input type="password" size="50" name="ftp_password" id="ftp_password" style="width: 99%;" class="input_password">
 
 							</dd>
 
 							<dt>
 
-								<strong>', $txt['package_download_filename'], ':</strong>
 
+								<label for="ftp_path">', $txt['package_ftp_path'], ':</label>
 
 							</dt>
 
 							<dd>
 
-								<input type="text" name="filename" size="44" class="input_text"><br>
 
-								<span class="smalltext">', $txt['package_download_filename_info'], '</span>
 
+								<input type="text" size="50" name="ftp_path" id="ftp_path" value="', $context['package_ftp']['path'], '" style="width: 99%;" class="input_text">
 
 							</dd>
 
 						</dl>
 
 						<div class="righttext">
 
-							<input type="submit" value="', $txt['download'], '" class="button_submit">
 
+							<input type="submit" value="', $txt['package_proceed'], '" class="button_submit">
 
 						</div>
 
 					</form>
 
-				</fieldset>
 
-			</div>
 
-		</div>
 
-		<br>
 
-		<div class="cat_bar">
 
-			<h3 class="catbg">' . $txt['package_upload_title'] . '</h3>
 
-		</div>
 
-		<div class="windowbg">
 
-			<div class="content">
 
-				<form action="' . $scripturl . '?action=admin;area=packages;get;sa=upload" method="post" accept-charset="', $context['character_set'], '" enctype="multipart/form-data" style="margin-bottom: 0;">
 
-					<dl class="settings">
 
-						<dt>
 
-							<strong>' . $txt['package_upload_select'] . ':</strong>
 
-						</dt>
 
-						<dd>
 
-							<input type="file" name="package" size="38" class="input_file">
 
-						</dd>
 
-					</dl>
 
-					<hr class="hrcolor">
 
-					<input type="submit" value="' . $txt['package_upload'] . '" class="button_submit">
 
-					<input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '">
 
-				</form>
 
+				</div>
 
+			</div>';
 
+	}
 
+
 
+	echo '
 
+			<div class="windowbg2">
 
+				<div class="content">
 
+					<fieldset>
 
+						<legend>' . $txt['package_servers'] . '</legend>
 
+						<ul class="package_servers">';
 
+	foreach ($context['servers'] as $server)
 
+		echo '
 
+							<li class="flow_auto">
 
+								<span class="floatleft">' . $server['name'] . '</span>
 
+								<span class="package_server floatright"><a href="' . $scripturl . '?action=admin;area=packages;get;sa=remove;server=' . $server['id'] . ';', $context['session_var'], '=', $context['session_id'], '">[ ' . $txt['delete'] . ' ]</a></span>
 
+								<span class="package_server floatright"><a href="' . $scripturl . '?action=admin;area=packages;get;sa=browse;server=' . $server['id'] . '">[ ' . $txt['package_browse'] . ' ]</a></span>
 
+							</li>';
 
+	echo '
 
+						</ul>
 
+					</fieldset>
 
+					<fieldset>
 
+						<legend>' . $txt['add_server'] . '</legend>
 
+						<form action="' . $scripturl . '?action=admin;area=packages;get;sa=add" method="post" accept-charset="', $context['character_set'], '">
 
+							<dl class="settings">
 
+								<dt>
 
+									<strong>' . $txt['server_name'] . ':</strong>
 
+								</dt>
 
+								<dd>
 
+									<input type="text" name="servername" size="44" value="SMF" class="input_text">
 
+								</dd>
 
+								<dt>
 
+									<strong>' . $txt['serverurl'] . ':</strong>
 
+								</dt>
 
+								<dd>
 
+									<input type="text" name="serverurl" size="44" value="http://" class="input_text">
 
+								</dd>
 
+							</dl>
 
+							<div class="righttext">
 
+								<input type="submit" value="' . $txt['add_server'] . '" class="button_submit">
 
+								<input type="hidden" name="' . $context['session_var'] . '" value="' . $context['session_id'] . '">
 
+							</div>
 
+						</form>
 
+					</fieldset>
 
+					<fieldset>
 
+						<legend>', $txt['package_download_by_url'], '</legend>
 
+						<form action="', $scripturl, '?action=admin;area=packages;get;sa=download;byurl;', $context['session_var'], '=', $context['session_id'], '" method="post" accept-charset="', $context['character_set'], '">
 
+							<dl class="settings">
 
+								<dt>
 
+									<strong>' . $txt['serverurl'] . ':</strong>
 
+								</dt>
 
+								<dd>
 
+									<input type="text" name="package" size="44" value="http://" class="input_text">
 
+								</dd>
 
+								<dt>
 
+									<strong>', $txt['package_download_filename'], ':</strong>
 
+								</dt>
 
+								<dd>
 
+									<input type="text" name="filename" size="44" class="input_text"><br>
 
+									<span class="smalltext">', $txt['package_download_filename_info'], '</span>
 
+								</dd>
 
+							</dl>
 
+							<div class="righttext">
 
+								<input type="submit" value="', $txt['download'], '" class="button_submit">
 
+							</div>
 
+						</form>
 
+					</fieldset>
 
+				</div>
 
 			</div>
 
 		</div>
 
 	</div>';
--- a/Themes/default/PersonalMessage.template.php
+++ b/Themes/default/PersonalMessage.template.php
@@ -284,11 +284,6 @@ function template_folder()
 
 					<a href="', $scripturl, '?action=modifykarma;sa=applaud;uid=', $message['member']['id'], ';f=', $context['folder'], ';start=', $context['start'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pm=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $modSettings['karmaApplaudLabel'], '</a> <a href="', $scripturl, '?action=modifykarma;sa=smite;uid=', $message['member']['id'], ';f=', $context['folder'], ';start=', $context['start'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pm=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $modSettings['karmaSmiteLabel'], '</a>
 
 				</li>';
 
 
 
-				// Show the member's gender icon?
 
-				if (!empty($settings['show_gender']) && $message['member']['gender']['image'] != '' && !isset($context['disabled_fields']['gender']))
 
-					echo '
 
-				<li class="gender">', $txt['gender'], ': ', $message['member']['gender']['image'], '</li>';
 
-
 
 				// Show their personal text?
 
 				if (!empty($settings['show_blurb']) && $message['member']['blurb'] != '')
 
 					echo '
@@ -318,18 +313,6 @@ function template_folder()
 
 				</li>';
 
 				}
 
 
 
-				// This shows the popular messaging icons.
 
-				if ($message['member']['has_messenger'] && $message['member']['can_view_profile'])
 
-					echo '
 
-				<li class="im_icons">
 
-					<ol>
 
-						', !isset($context['disabled_fields']['icq']) && !empty($message['member']['icq']['link']) ? '<li>' . $message['member']['icq']['link'] . '</li>' : '', '
 
-						', !isset($context['disabled_fields']['skype']) && !empty($message['member']['skype']['link']) ? '<li>' . $message['member']['skype']['link'] . '</li>' : '', '
 
-						', !isset($context['disabled_fields']['aim']) && !empty($message['member']['aim']['link']) ? '<li>' . $message['member']['aim']['link'] . '</li>' : '', '
 
-						', !isset($context['disabled_fields']['yim']) && !empty($message['member']['yim']['link']) ? '<li>' . $message['member']['yim']['link'] . '</li>' : '', '
 
-					</ol>
 
-				</li>';
 
-
 
 				if ($message['can_report'])
 
 					echo '
 
 				<li class="report_link"><a href="' . $scripturl . '?action=pm;sa=report;l=' . $context['current_label_id'] . ';pmsg=' . $message['id'] . '">' . $txt['pm_report_to_admin'] . '</a></li>';
--- a/Themes/default/Profile.template.php
+++ b/Themes/default/Profile.template.php
@@ -718,6 +718,7 @@ function template_editIgnoreList()
 
 	if (allowedTo('moderate_forum'))
 
 		echo '
 
 				<th scope="col">', $txt['email'], '</th>';
 
+
 
 	echo '
 
 			</tr>';
 
 
--- a/Themes/default/Who.template.php
+++ b/Themes/default/Who.template.php
@@ -59,13 +59,12 @@ function template_main()
 
 						<tr class="windowbg', $alternate ? '2' : '', '">
 
 							<td>';
 
 
 
-		// Guests don't have information like icq, skype, y!, and aim... and they can't be messaged.
 
+		// Guests can't be messaged.
 
 		if (!$member['is_guest'])
 
 		{
 
 			echo '
 
 								<span class="contact_info floatright">
 
 									', $context['can_send_pm'] ? '<a href="' . $member['online']['href'] . '" title="' . $member['online']['text'] . '">' : '', $settings['use_image_buttons'] ? '<img src="' . $member['online']['image_href'] . '" alt="' . $member['online']['text'] . '" align="bottom">' : $member['online']['label'], $context['can_send_pm'] ? '</a>' : '', '
 
-									', isset($context['disabled_fields']['icq']) ? '' : $member['icq']['link'] , ' ', isset($context['disabled_fields']['skype']) ? '' : $member['skype']['link'], ' ', isset($context['disabled_fields']['yim']) ? '' : $member['yim']['link'], ' ', isset($context['disabled_fields']['aim']) ? '' : $member['aim']['link'], '
 
 								</span>';
 
 		}
 
 
--- a/Themes/default/languages/Admin.english.php
+++ b/Themes/default/languages/Admin.english.php
@@ -283,7 +283,6 @@ $txt['activated'] = 'Activated';
 
 $txt['not_activated'] = 'Not activated';
 
 $txt['primary'] = 'Primary';
 
 $txt['additional'] = 'Additional';
 
-$txt['messenger_address'] = 'Messenger Address';
 
 $txt['wild_cards_allowed'] = 'wildcard characters * and ? are allowed';
 
 $txt['search_for'] = 'Search for';
 
 $txt['search_match'] = 'Match';
--- a/Themes/default/languages/Errors.english.php
+++ b/Themes/default/languages/Errors.english.php
@@ -340,7 +340,6 @@ $txt['profile_error_password_chars'] = 'Your password must contain a mix of uppe
 
 $txt['profile_error_already_requested_group'] = 'You already have an outstanding request for this group!';
 
 $txt['profile_error_openid_in_use'] = 'Another user is already using that OpenID authentication URL';
 
 $txt['profile_error_signature_not_yet_saved'] = 'The signature has not been saved.';
 
-$txt['profile_error_aim_too_long'] = 'The AIM nickname is too long.';
 
 $txt['profile_error_personal_text_too_long'] = 'The personal text is too long.';
 
 $txt['profile_error_user_title_too_long'] = 'The custom title is too long.';
 
 
--- a/Themes/default/languages/ManagePermissions.english.php
+++ b/Themes/default/languages/ManagePermissions.english.php
@@ -43,8 +43,8 @@ $txt['permissionname_profile_forum'] = 'Allow Forum Profile edits';
 
 $txt['permissionhelp_profile_forum'] = 'This option will allow a member to edit their Forum Profile';
 
 $txt['permissionname_profile_forum_own'] = 'Own profile';
 
 $txt['permissionname_profile_forum_any'] = 'Any profile';
 
-$txt['permissionname_profile_other'] = 'Edit website and location';
 
-$txt['permissionhelp_profile_other'] = 'Allow the member to edit the website, and location fields in their profile';
 
+$txt['permissionname_profile_other'] = 'Edit website';
 
+$txt['permissionhelp_profile_other'] = 'Allow the member to edit the website fields in their profile';
 
 $txt['permissionname_profile_other_own'] = 'Own profile';
 
 $txt['permissionname_profile_other_any'] = 'Any profile';
 
 $txt['permissionname_profile_blurb'] = 'Edit personal text';
--- a/Themes/default/languages/Profile.english.php
+++ b/Themes/default/languages/Profile.english.php
@@ -43,9 +43,6 @@ $txt['dob_year'] = 'Year (YYYY)';
 
 $txt['password_strength'] = 'For best security, you should use eight or more characters with a combination of letters, numbers, and symbols.';
 
 $txt['include_website_url'] = 'This must be included if you specify a URL below.';
 
 $txt['complete_url'] = 'This must be a complete URL.';
 
-$txt['your_icq'] = 'This is your ICQ number.';
 
-$txt['your_aim'] = 'This is your AOL Instant Messenger nickname.';
 
-$txt['your_yim'] = 'This is your Yahoo! Instant Messenger nickname.';
 
 $txt['sig_info'] = 'Signatures are displayed at the bottom of each post or personal message. BBCode and smileys may be used in your signature.';
 
 $txt['no_signature_set'] = 'No signature set.';
 
 $txt['max_sig_characters'] = 'Max characters: %1$d; characters remaining: ';
--- a/Themes/default/languages/index.english.php
+++ b/Themes/default/languages/index.english.php
@@ -331,17 +331,6 @@ $txt['days_word'] = 'days';
 
 $txt['search_for'] = 'Search for';
 
 $txt['search_match'] = 'Match';
 
 
 
-$txt['aim'] = 'AIM';
 
-// In this string, please use +'s for spaces.
 
-$txt['aim_default_message'] = 'Hi.+Are+you+there?';
 
-$txt['aim_title'] = 'AOL Instant Messenger';
 
-$txt['icq'] = 'ICQ';
 
-$txt['icq_title'] = 'ICQ Messenger';
 
-$txt['yim'] = 'YIM';
 
-$txt['yim_title'] = 'Yahoo Instant Messenger';
 
-
 
-$txt['skype'] = 'Skype';
 
-
 
 $txt['forum_in_maintainence'] = 'Your forum is in Maintenance Mode. Only administrators can currently log in.';
 
 $txt['maintenance_page'] = 'You can turn off Maintenance Mode from the <a href="%1$s">Server Settings</a> area.';
 
 
@@ -443,7 +432,7 @@ $txt['split_after_and_this_post'] = 'Split topic after and including this post.'
 
 $txt['select_split_posts'] = 'Select posts to split.';
 
 $txt['new_topic'] = 'New Topic';
 
 $txt['split_successful'] = 'Topic successfully split into two topics.';
 
-$txt['origin_topic'] = 'Origin Topic';
 
+$txt['origin_topic'] = 'Original Topic';
 
 $txt['please_select_split'] = 'Please select which posts you wish to split.';
 
 $txt['merge_successful'] = 'Topics successfully merged.';
 
 $txt['new_merged_topic'] = 'Newly Merged Topic';
--- a/other/install.php
+++ b/other/install.php
@@ -1463,7 +1463,7 @@ function AdminAccount()
 
 					'password_salt' => 'string', 'lngfile' => 'string', 'personal_text' => 'string', 'avatar' => 'string',
 
 					'member_ip' => 'string', 'member_ip2' => 'string', 'buddy_list' => 'string', 'pm_ignore_list' => 'string',
 
 					'website_title' => 'string', 'website_url' => 'string', 'location' => 'string',
 
-					'aim' => 'string', 'icq' => 'string', 'skype' => 'string', 'signature' => 'string', 'usertitle' => 'string', 'secret_question' => 'string',
 
+					'signature' => 'string', 'usertitle' => 'string', 'secret_question' => 'string',
 
 					'additional_groups' => 'string', 'ignore_boards' => 'string', 'openid_uri' => 'string',
 
 				),
 
 				array(
@@ -1472,7 +1472,7 @@ function AdminAccount()
 
 					$incontext['member_salt'], '', '', '',
 
 					$ip, $ip, '', '',
 
 					'', '', '',
 
-					'', '', '', '', '', '',
 
+					'', '', '',
 
 					'', '', '',
 
 				),
 
 				array('id_member')
--- a/other/install_2-1_mysql.sql
+++ b/other/install_2-1_mysql.sql
@@ -1224,15 +1224,9 @@ CREATE TABLE {$db_prefix}members (
 
   openid_uri text NOT NULL,
 
   email_address varchar(255) NOT NULL default '',
 
   personal_text varchar(255) NOT NULL default '',
 
-  gender tinyint(4) unsigned NOT NULL default '0',
 
   birthdate date NOT NULL default '0001-01-01',
 
   website_title varchar(255) NOT NULL default '',
 
   website_url varchar(255) NOT NULL default '',
 
-  location varchar(255) NOT NULL default '',
 
-  icq varchar(255) NOT NULL default '',
 
-  aim varchar(255) NOT NULL default '',
 
-  yim varchar(32) NOT NULL default '',
 
-  skype varchar(255) NOT NULL default '',
 
   hide_email tinyint(4) NOT NULL default '0',
 
   show_online tinyint(4) NOT NULL default '1',
 
   time_format varchar(80) NOT NULL default '',
@@ -2032,7 +2026,6 @@ VALUES (1, 'name', '{$default_theme_name}'),
 
 	(1, 'show_modify', '1'),
 
 	(1, 'show_user_images', '1'),
 
 	(1, 'show_blurb', '1'),
 
-	(1, 'show_gender', '0'),
 
 	(1, 'show_newsfader', '0'),
 
 	(1, 'number_recent_posts', '0'),
 
 	(1, 'show_profile_buttons', '1'),
--- a/other/install_2-1_postgresql.sql
+++ b/other/install_2-1_postgresql.sql
@@ -1623,15 +1623,10 @@ CREATE TABLE {$db_prefix}members (
 
   openid_uri text NOT NULL,
 
   email_address varchar(255) NOT NULL,
 
   personal_text varchar(255) NOT NULL,
 
-  gender smallint NOT NULL default '0',
 
   birthdate date NOT NULL default '0001-01-01',
 
   website_title varchar(255) NOT NULL,
 
   website_url varchar(255) NOT NULL,
 
   location varchar(255) NOT NULL,
 
-  icq varchar(255) NOT NULL,
 
-  aim varchar(255) NOT NULL default '',
 
-  yim varchar(32) NOT NULL default '',
 
-  skype varchar(255) NOT NULL default '',
 
   hide_email smallint NOT NULL default '0',
 
   show_online smallint NOT NULL default '1',
 
   time_format varchar(80) NOT NULL default '',
@@ -2565,7 +2560,6 @@ INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_late
 
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_modify', '1');
 
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_user_images', '1');
 
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_blurb', '1');
 
-INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_gender', '0');
 
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_newsfader', '0');
 
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'number_recent_posts', '0');
 
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_profile_buttons', '1');
--- a/other/install_2-1_sqlite.sql
+++ b/other/install_2-1_sqlite.sql
@@ -1324,15 +1324,9 @@ CREATE TABLE {$db_prefix}members (
 
   openid_uri text NOT NULL,
 
   email_address varchar(255) NOT NULL,
 
   personal_text varchar(255) NOT NULL,
 
-  gender smallint NOT NULL default '0',
 
   birthdate date NOT NULL default '0001-01-01',
 
   website_title varchar(255) NOT NULL,
 
   website_url varchar(255) NOT NULL,
 
-  location varchar(255) NOT NULL,
 
-  icq varchar(255) NOT NULL,
 
-  aim varchar(255) NOT NULL default '',
 
-  yim varchar(32) NOT NULL default '',
 
-  skype varchar(255) NOT NULL default '',
 
   hide_email smallint NOT NULL default '0',
 
   show_online smallint NOT NULL default '1',
 
   time_format varchar(80) NOT NULL default '',
@@ -2184,7 +2178,6 @@ INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_late
 
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_modify', '1');
 
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_user_images', '1');
 
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_blurb', '1');
 
-INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_gender', '0');
 
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_newsfader', '0');
 
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'number_recent_posts', '0');
 
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_profile_buttons', '1');
--- a/other/install_2-1_sqlite3.sql
+++ b/other/install_2-1_sqlite3.sql
@@ -1324,15 +1324,9 @@ CREATE TABLE {$db_prefix}members (
 
   openid_uri text NOT NULL,
 
   email_address varchar(255) NOT NULL,
 
   personal_text varchar(255) NOT NULL,
 
-  gender smallint NOT NULL default '0',
 
   birthdate date NOT NULL default '0001-01-01',
 
   website_title varchar(255) NOT NULL,
 
   website_url varchar(255) NOT NULL,
 
-  location varchar(255) NOT NULL,
 
-  icq varchar(255) NOT NULL,
 
-  aim varchar(255) NOT NULL default '',
 
-  yim varchar(32) NOT NULL default '',
 
-  skype varchar(255) NOT NULL default '',
 
   hide_email smallint NOT NULL default '0',
 
   show_online smallint NOT NULL default '1',
 
   time_format varchar(80) NOT NULL default '',
@@ -2184,7 +2178,6 @@ INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_late
 
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_modify', '1');
 
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_user_images', '1');
 
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_blurb', '1');
 
-INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_gender', '0');
 
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_newsfader', '0');
 
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'number_recent_posts', '0');
 
 INSERT INTO {$db_prefix}themes (id_theme, variable, value) VALUES (1, 'show_profile_buttons', '1');
--- a/other/upgrade_2-1_mysql.sql
+++ b/other/upgrade_2-1_mysql.sql
@@ -334,14 +334,6 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}background_tasks (
 
 ) ENGINE=MyISAM;
 
 ---#
 
 
 
-/******************************************************************************/
 
----- Replacing MSN with Skype
 
-/******************************************************************************/
 
----# Modifying the "msn" column...
 
-ALTER TABLE {$db_prefix}members
 
-CHANGE msn skype varchar(255) NOT NULL DEFAULT '';
 
----#
 
-
 
 /******************************************************************************/
 
 --- Adding support for deny boards access
 
 /******************************************************************************/
@@ -568,6 +560,70 @@ if (file_exists($GLOBALS['boarddir'] . '/Themes/core'))
 
 ---}
 
 ---#
 
 
 
+/******************************************************************************/
 
+--- Messenger fields
 
+/******************************************************************************/
 
+---# Insert fields
 
+INSERT INTO `{$db_prefix}custom_fields` (`col_name`, `field_name`, `field_desc`, `field_type`, `field_length`, `field_options`, `mask`, `show_reg`, `show_display`, `show_profile`, `private`, `active`, `bbc`, `can_search`, `default_value`, `enclose`, `placement`) VALUES
 
+('cust_aolins', 'AOL Instant Messenger', 'This is your AOL Instant Messenger nickname.', 'text', 50, '', 'regex~[a-z][0-9a-z.-]{1,31}~i', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="aim" href="aim:goim?screenname={INPUT}&message=Hello!+Are+you+there?" target="_blank" title="AIM - {INPUT}"><img src="{IMAGES_URL}/fields/aim.gif" alt="AIM - {INPUT}"></a>', 1),
 
+('cust_icq', 'ICQ', 'This is your ICQ number.', 'text', 12, '', 'regex~[1-9][0-9]{4,9}~i', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="icq" href="http://www.icq.com/whitepages/about_me.php?uin={INPUT}" target="_blank" title="ICQ - {INPUT}"><img src="http://status.icq.com/online.gif?img=5&icq={INPUT}" alt="ICQ - {INPUT}" width="18" height="18"></a>', 1),
 
+('cust_skype', 'Skype', 'Your Skype name', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="skype new_win" href="skype:{INPUT}?chat" title="Live - {INPUT}"><img src="{IMAGES_URL}/skype.png" alt="Live - {INPUT}"></a>', 1),
 
+('cust_yahoo', 'Yahoo! Messenger', 'This is your Yahoo! Instant Messenger nickname.', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="yim" href="http://edit.yahoo.com/config/send_webmesg?.target={INPUT}" target="_blank" title="Yahoo! Messenger - {INPUT}"><img src="http://opi.yahoo.com/online?m=g&t=0&u={INPUT}" alt="Yahoo! Messenger - {INPUT}"></a>', 1);
 
+('cust_loca', 'Location', 'Geographic location.', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '', 1);
 
+('cust_gender', 'Gender', 'Your gender.', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '', 1);
 
+---#
 
+
 
+---# Converting member values...
 
+---{
 
+// We cannot do this twice
 
+if (@$modSettings['smfVersion'] < '2.2')
 
+{
 
+	$request = upgrade_query("
 
+		SELECT id_member, aim, icq, msn, yim, location, gender
 
+		FROM {$db_prefix}members");
 
+	$inserts = array();
 
+	while ($row = mysql_fetch_assoc($request))
 
+	{
 
+		if (!empty($row[aim]))
 
+			$inserts[] = "($row[id_member], -1, 'cust_aolins', $row[aim])";
 
+
 
+		if (!empty($row[icq]))
 
+			$inserts[] = "($row[id_member], -1, 'cust_icq', $row[icq])";
 
+
 
+		if (!empty($row[msn]))
 
+			$inserts[] = "($row[id_member], -1, 'cust_skype', $row[msn])";
 
+
 
+		if (!empty($row[yim]))
 
+			$inserts[] = "($row[id_member], -1, 'cust_yahoo', $row[yim])";
 
+
 
+		if (!empty($row[location]))
 
+			$inserts[] = "($row[id_member], -1, 'cust_loca', $row[location])";
 
+
 
+		if (!empty($row[gender]))
 
+			$inserts[] = "($row[id_member], -1, 'cust_gender', $row[gender])";
 
+	}
 
+	mysql_free_result($request);
 
+
 
+	if (!empty($inserts))
 
+		upgrade_query("
 
+			INSERT INTO {$db_prefix}themes
 
+				(id_member, id_theme, variable, value)
 
+			VALUES
 
+				" . implode(',', $inserts));
 
+}
 
+---}
 
+---#
 
+
 
+---# Dropping old fields
 
+ALTER TABLE `{$db_prefix}members`
 
+  DROP `icq`,
 
+  DROP `aim`,
 
+  DROP `yim`,
 
+  DROP `msn`;
 
+  DROP `location`;
 
+  DROP `gender`;
 
+---#
 
+
 
 /******************************************************************************/
 
 --- Adding support for drafts
 
 /******************************************************************************/
--- a/other/upgrade_2-1_postgresql.sql
+++ b/other/upgrade_2-1_postgresql.sql
@@ -391,14 +391,6 @@ CREATE TABLE {$db_prefix}background_tasks (
 
 );
 
 ---#
 
 
 
-/******************************************************************************/
 
----- Replacing MSN with Skype
 
-/******************************************************************************/
 
----# Modifying the "msn" column...
 
-ALTER TABLE {$db_prefix}members
 
-RENAME msn TO skype;
 
----#
 
-
 
 /******************************************************************************/
 
 --- Adding support for deny boards access
 
 /******************************************************************************/
@@ -638,6 +630,70 @@ if (file_exists($GLOBALS['boarddir'] . '/Themes/core'))
 
 ---}
 
 ---#
 
 
 
+/******************************************************************************/
 
+--- Messenger fields
 
+/******************************************************************************/
 
+---# Insert fields
 
+INSERT INTO `{$db_prefix}custom_fields` (`col_name`, `field_name`, `field_desc`, `field_type`, `field_length`, `field_options`, `mask`, `show_reg`, `show_display`, `show_profile`, `private`, `active`, `bbc`, `can_search`, `default_value`, `enclose`, `placement`) VALUES
 
+('cust_aolins', 'AOL Instant Messenger', 'This is your AOL Instant Messenger nickname.', 'text', 50, '', 'regex~[a-z][0-9a-z.-]{1,31}~i', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="aim" href="aim:goim?screenname={INPUT}&message=Hello!+Are+you+there?" target="_blank" title="AIM - {INPUT}"><img src="{IMAGES_URL}/fields/aim.gif" alt="AIM - {INPUT}"></a>', 1),
 
+('cust_icq', 'ICQ', 'This is your ICQ number.', 'text', 12, '', 'regex~[1-9][0-9]{4,9}~i', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="icq" href="http://www.icq.com/whitepages/about_me.php?uin={INPUT}" target="_blank" title="ICQ - {INPUT}"><img src="http://status.icq.com/online.gif?img=5&icq={INPUT}" alt="ICQ - {INPUT}" width="18" height="18"></a>', 1),
 
+('cust_skype', 'Skype', 'Your Skype name', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="skype new_win" href="skype:{INPUT}?chat" title="Live - {INPUT}"><img src="{IMAGES_URL}/skype.png" alt="Live - {INPUT}"></a>', 1),
 
+('cust_yahoo', 'Yahoo! Messenger', 'This is your Yahoo! Instant Messenger nickname.', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="yim" href="http://edit.yahoo.com/config/send_webmesg?.target={INPUT}" target="_blank" title="Yahoo! Messenger - {INPUT}"><img src="http://opi.yahoo.com/online?m=g&t=0&u={INPUT}" alt="Yahoo! Messenger - {INPUT}"></a>', 1);
 
+('cust_loca', 'Location', 'Geographic location.', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '', 1);
 
+('cust_gender', 'Gender', 'Your gender.', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '', 1);
 
+---#
 
+
 
+---# Converting member values...
 
+---{
 
+// We cannot do this twice
 
+if (@$modSettings['smfVersion'] < '2.2')
 
+{
 
+	$request = upgrade_query("
 
+		SELECT id_member, aim, icq, msn, yim, location, gender
 
+		FROM {$db_prefix}members");
 
+	$inserts = array();
 
+	while ($row = mysql_fetch_assoc($request))
 
+	{
 
+		if (!empty($row[aim]))
 
+			$inserts[] = "($row[id_member], -1, 'cust_aolins', $row[aim])";
 
+
 
+		if (!empty($row[icq]))
 
+			$inserts[] = "($row[id_member], -1, 'cust_icq', $row[icq])";
 
+
 
+		if (!empty($row[msn]))
 
+			$inserts[] = "($row[id_member], -1, 'cust_skype', $row[msn])";
 
+
 
+		if (!empty($row[yim]))
 
+			$inserts[] = "($row[id_member], -1, 'cust_yahoo', $row[yim])";
 
+
 
+		if (!empty($row[location]))
 
+			$inserts[] = "($row[id_member], -1, 'cust_loca', $row[location])";
 
+
 
+		if (!empty($row[gender]))
 
+			$inserts[] = "($row[id_member], -1, 'cust_gender', $row[gender])";
 
+	}
 
+	mysql_free_result($request);
 
+
 
+	if (!empty($inserts))
 
+		upgrade_query("
 
+			INSERT INTO {$db_prefix}themes
 
+				(id_member, id_theme, variable, value)
 
+			VALUES
 
+				" . implode(',', $inserts));
 
+}
 
+---}
 
+---#
 
+
 
+---# Dropping old fields
 
+ALTER TABLE `{$db_prefix}members`
 
+  DROP `icq`,
 
+  DROP `aim`,
 
+  DROP `yim`,
 
+  DROP `msn`;
 
+  DROP `location`;
 
+  DROP `gender`;
 
+---#
 
+
 
 /******************************************************************************/
 
 --- Adding support for drafts
 
 /******************************************************************************/
--- a/other/upgrade_2-1_sqlite.sql
+++ b/other/upgrade_2-1_sqlite.sql
@@ -354,14 +354,6 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}background_tasks (
 
 );
 
 ---#
 
 
 
-/******************************************************************************/
 
----- Replacing MSN with Skype
 
-/******************************************************************************/
 
----# Modifying the "msn" column...
 
-ALTER TABLE {$db_prefix}members
 
-CHANGE msn skype varchar(255) NOT NULL DEFAULT '';
 
----#
 
-
 
 /******************************************************************************/
 
 --- Adding support for deny boards access
 
 /******************************************************************************/
@@ -634,6 +626,70 @@ if (file_exists($GLOBALS['boarddir'] . '/Themes/core'))
 
 	}
 
 }
 
 
 
+/******************************************************************************/
 
+--- Messenger fields
 
+/******************************************************************************/
 
+---# Insert fields
 
+INSERT INTO `{$db_prefix}custom_fields` (`col_name`, `field_name`, `field_desc`, `field_type`, `field_length`, `field_options`, `mask`, `show_reg`, `show_display`, `show_profile`, `private`, `active`, `bbc`, `can_search`, `default_value`, `enclose`, `placement`) VALUES
 
+('cust_aolins', 'AOL Instant Messenger', 'This is your AOL Instant Messenger nickname.', 'text', 50, '', 'regex~[a-z][0-9a-z.-]{1,31}~i', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="aim" href="aim:goim?screenname={INPUT}&message=Hello!+Are+you+there?" target="_blank" title="AIM - {INPUT}"><img src="{IMAGES_URL}/fields/aim.gif" alt="AIM - {INPUT}"></a>', 1),
 
+('cust_icq', 'ICQ', 'This is your ICQ number.', 'text', 12, '', 'regex~[1-9][0-9]{4,9}~i', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="icq" href="http://www.icq.com/whitepages/about_me.php?uin={INPUT}" target="_blank" title="ICQ - {INPUT}"><img src="http://status.icq.com/online.gif?img=5&icq={INPUT}" alt="ICQ - {INPUT}" width="18" height="18"></a>', 1),
 
+('cust_skype', 'Skype', 'Your Skype name', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="skype new_win" href="skype:{INPUT}?chat" title="Live - {INPUT}"><img src="{IMAGES_URL}/skype.png" alt="Live - {INPUT}"></a>', 1),
 
+('cust_yahoo', 'Yahoo! Messenger', 'This is your Yahoo! Instant Messenger nickname.', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '<a class="yim" href="http://edit.yahoo.com/config/send_webmesg?.target={INPUT}" target="_blank" title="Yahoo! Messenger - {INPUT}"><img src="http://opi.yahoo.com/online?m=g&t=0&u={INPUT}" alt="Yahoo! Messenger - {INPUT}"></a>', 1);
 
+('cust_loca', 'Location', 'Geographic location.', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '', 1);
 
+('cust_gender', 'Gender', 'Your gender.', 'text', 50, '', 'email', 0, 1, 'forumprofile', 0, 1, 0, 0, '', '', 1);
 
+---#
 
+
 
+---# Converting member values...
 
+---{
 
+// We cannot do this twice
 
+if (@$modSettings['smfVersion'] < '2.2')
 
+{
 
+	$request = upgrade_query("
 
+		SELECT id_member, aim, icq, msn, yim, location, gender
 
+		FROM {$db_prefix}members");
 
+	$inserts = array();
 
+	while ($row = mysql_fetch_assoc($request))
 
+	{
 
+		if (!empty($row[aim]))
 
+			$inserts[] = "($row[id_member], -1, 'cust_aolins', $row[aim])";
 
+
 
+		if (!empty($row[icq]))
 
+			$inserts[] = "($row[id_member], -1, 'cust_icq', $row[icq])";
 
+
 
+		if (!empty($row[msn]))
 
+			$inserts[] = "($row[id_member], -1, 'cust_skype', $row[msn])";
 
+
 
+		if (!empty($row[yim]))
 
+			$inserts[] = "($row[id_member], -1, 'cust_yahoo', $row[yim])";
 
+
 
+		if (!empty($row[location]))
 
+			$inserts[] = "($row[id_member], -1, 'cust_loca', $row[location])";
 
+
 
+		if (!empty($row[gender]))
 
+			$inserts[] = "($row[id_member], -1, 'cust_gender', $row[gender])";
 
+	}
 
+	mysql_free_result($request);
 
+
 
+	if (!empty($inserts))
 
+		upgrade_query("
 
+			INSERT INTO {$db_prefix}themes
 
+				(id_member, id_theme, variable, value)
 
+			VALUES
 
+				" . implode(',', $inserts));
 
+}
 
+---}
 
+---#
 
+
 
+---# Dropping old fields
 
+ALTER TABLE `{$db_prefix}members`
 
+  DROP `icq`,
 
+  DROP `aim`,
 
+  DROP `yim`,
 
+  DROP `msn`;
 
+  DROP `location`;
 
+  DROP `gender`;
 
+---#
 
+
 
 /******************************************************************************/
 
 --- Adding support for drafts
 
 /******************************************************************************/