diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-05 22:13:22 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-05 22:13:22 +0100 |
| commit | f2059f52f3f8f430888366b70aa07c534abb35a1 (patch) | |
| tree | a0eac95bf86b38536793107f12d1b39f2b5128cc /phpBB/includes/ucp | |
| parent | a1dab58f6d030ba8d986a27b3faf5a91629d688b (diff) | |
| download | forums-f2059f52f3f8f430888366b70aa07c534abb35a1.tar forums-f2059f52f3f8f430888366b70aa07c534abb35a1.tar.gz forums-f2059f52f3f8f430888366b70aa07c534abb35a1.tar.bz2 forums-f2059f52f3f8f430888366b70aa07c534abb35a1.tar.xz forums-f2059f52f3f8f430888366b70aa07c534abb35a1.zip | |
[ticket/12236] Move AOL Instant Messanger field to custom profile field
PHPBB3-12236
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 3e2b8f7456..b68389cba7 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -209,7 +209,6 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) 'MESSAGE_ID' => $message_row['msg_id'], 'U_PM' => ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($user_info['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $author_id) : '', - 'U_AIM' => ($user_info['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=aim&u=' . $author_id) : '', 'U_JABBER' => ($user_info['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=jabber&u=' . $author_id) : '', 'U_DELETE' => ($auth->acl_get('u_pm_delete')) ? "$url&mode=compose&action=delete&f=$folder_id&p=" . $message_row['msg_id'] : '', diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 9ed4278ec2..3772d56e28 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -264,7 +264,6 @@ class ucp_profile $cp_data = $cp_error = array(); $data = array( - 'aim' => request_var('aim', $user->data['user_aim']), 'jabber' => utf8_normalize_nfc(request_var('jabber', $user->data['user_jabber'], true)), ); @@ -288,7 +287,6 @@ class ucp_profile if ($submit) { $validate_array = array( - 'aim' => array('string', true, 3, 255), 'jabber' => array( array('string', true, 5, 255), array('jabber')), @@ -331,7 +329,6 @@ class ucp_profile } $sql_ary = array( - 'user_aim' => $data['aim'], 'user_jabber' => $data['jabber'], 'user_notify_type' => $data['notify'], ); @@ -394,8 +391,6 @@ class ucp_profile $template->assign_vars(array( 'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '', - - 'AIM' => $data['aim'], 'JABBER' => $data['jabber'], )); |