diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-01-15 18:54:11 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-01-15 18:54:11 -0600 |
| commit | d59431691c27c73fba8ae9934b84b34a13280dd2 (patch) | |
| tree | 2d389fda2908ae58c975826cabd017de8014d810 /phpBB/includes/acp | |
| parent | a2f6e494f37914352b0bb72d5a84904d3f2c51a3 (diff) | |
| parent | 460470229d972b93ef5a98b0d1d97a2a970d684f (diff) | |
| download | forums-d59431691c27c73fba8ae9934b84b34a13280dd2.tar forums-d59431691c27c73fba8ae9934b84b34a13280dd2.tar.gz forums-d59431691c27c73fba8ae9934b84b34a13280dd2.tar.bz2 forums-d59431691c27c73fba8ae9934b84b34a13280dd2.tar.xz forums-d59431691c27c73fba8ae9934b84b34a13280dd2.zip | |
Merge remote-tracking branch 'remotes/nickv/ticket/11201' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11201:
[ticket/11201] Remove database column on update
[ticket/11201] Remove MSN/WLM fields
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 82d8ef5cbb..2bdbf1441a 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1352,7 +1352,6 @@ class acp_users $data = array( 'icq' => request_var('icq', $user_row['user_icq']), 'aim' => request_var('aim', $user_row['user_aim']), - 'msn' => request_var('msn', $user_row['user_msnm']), 'yim' => request_var('yim', $user_row['user_yim']), 'jabber' => utf8_normalize_nfc(request_var('jabber', $user_row['user_jabber'], true)), 'website' => request_var('website', $user_row['user_website']), @@ -1382,7 +1381,6 @@ class acp_users array('string', true, 3, 15), array('match', true, '#^[0-9]+$#i')), 'aim' => array('string', true, 3, 255), - 'msn' => array('string', true, 5, 255), 'jabber' => array( array('string', true, 5, 255), array('jabber')), @@ -1416,7 +1414,6 @@ class acp_users $sql_ary = array( 'user_icq' => $data['icq'], 'user_aim' => $data['aim'], - 'user_msnm' => $data['msn'], 'user_yim' => $data['yim'], 'user_jabber' => $data['jabber'], 'user_website' => $data['website'], @@ -1469,7 +1466,6 @@ class acp_users 'ICQ' => $data['icq'], 'YIM' => $data['yim'], 'AIM' => $data['aim'], - 'MSN' => $data['msn'], 'JABBER' => $data['jabber'], 'WEBSITE' => $data['website'], 'LOCATION' => $data['location'], |