Update merge_users.php

AlexSheer · Nov 21, 2015 · 35cb97f · 35cb97f
1 parent 09aa2cb
commit 35cb97f
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/tools/usergroup/merge_users.php b/tools/usergroup/merge_users.php
@@ -382,9 +382,7 @@ function merge($source, $target)
 			'topics_posted'	=> null,
 			'topics_track'	=> null,
 			'topics_watch'	=> null,
-
 			'warnings'		=> 'user_id',
-
 			'zebra'			=> null,
 		) as $key => $data)
 		{
@@ -546,7 +544,7 @@ function merge($source, $target)
 			$update['target']['user_notify_type'] = NOTIFY_BOTH;
 		}
 
-		foreach (array('birthday', 'avatar', 'sig', 'from', 'icq', 'aim', 'yim', 'msnm', 'jabber', 'website', 'occ', 'interests') as $var)
+		foreach (array('birthday', 'avatar', 'sig', 'jabber') as $var)
 		{
 			if (!$target['user_' . $var] && $source['user_' . $var])
 			{