diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-02-04 20:57:37 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-02-04 20:57:37 -0600 |
| commit | 1e5a1b72dca4e0ccae9340467225499649dea6c8 (patch) | |
| tree | 6f16d15999e6ac5f158643619213acbf2a7daf7c /phpBB/includes/acp/acp_users.php | |
| parent | 34c564062a95b9306487fbc6bbd17c7c9c8a63c4 (diff) | |
| parent | 336187151a2010197ddda1bcdabc311fd10c1c87 (diff) | |
| download | forums-1e5a1b72dca4e0ccae9340467225499649dea6c8.tar forums-1e5a1b72dca4e0ccae9340467225499649dea6c8.tar.gz forums-1e5a1b72dca4e0ccae9340467225499649dea6c8.tar.bz2 forums-1e5a1b72dca4e0ccae9340467225499649dea6c8.tar.xz forums-1e5a1b72dca4e0ccae9340467225499649dea6c8.zip | |
Merge remote-tracking branch 'remotes/bantu/ticket/11201' into develop
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/11201:
[ticket/11201] Revert WLM dropping because it is still used in China.
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 2bdbf1441a..82d8ef5cbb 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1352,6 +1352,7 @@ 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']), @@ -1381,6 +1382,7 @@ 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')), @@ -1414,6 +1416,7 @@ 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'], @@ -1466,6 +1469,7 @@ class acp_users 'ICQ' => $data['icq'], 'YIM' => $data['yim'], 'AIM' => $data['aim'], + 'MSN' => $data['msn'], 'JABBER' => $data['jabber'], 'WEBSITE' => $data['website'], 'LOCATION' => $data['location'], |