diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-03 20:01:19 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-03 20:01:19 +0100 |
| commit | 5b1fbfb2f2c901b89bb1163503b0468e11bbc307 (patch) | |
| tree | afaa3d02d4155eb30034e1a07097c60bb8354ec6 /phpBB/includes/ucp | |
| parent | e750d71f840e0c2e8fe802c5cc593c0630746291 (diff) | |
| download | forums-5b1fbfb2f2c901b89bb1163503b0468e11bbc307.tar forums-5b1fbfb2f2c901b89bb1163503b0468e11bbc307.tar.gz forums-5b1fbfb2f2c901b89bb1163503b0468e11bbc307.tar.bz2 forums-5b1fbfb2f2c901b89bb1163503b0468e11bbc307.tar.xz forums-5b1fbfb2f2c901b89bb1163503b0468e11bbc307.zip | |
[ticket/12187] Remove user_website functionality
PHPBB3-12187
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 | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index b25ae32ad9..e4bc4629ac 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_WWW' => (!empty($user_info['user_website'])) ? $user_info['user_website'] : '', '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_YIM' => ($user_info['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($user_info['user_yim']) . '&.src=pg' : '', 'U_MSN' => ($user_info['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=msnm&u=' . $author_id) : '', diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 8e87c537cc..dc75dbb241 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -268,7 +268,6 @@ class ucp_profile 'msn' => request_var('msn', $user->data['user_msnm']), 'yim' => request_var('yim', $user->data['user_yim']), 'jabber' => utf8_normalize_nfc(request_var('jabber', $user->data['user_jabber'], true)), - 'website' => request_var('website', $user->data['user_website']), ); if ($config['allow_birthdays']) @@ -297,9 +296,6 @@ class ucp_profile array('string', true, 5, 255), array('jabber')), 'yim' => array('string', true, 5, 255), - 'website' => array( - array('string', true, 12, 255), - array('match', true, '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')), ); if ($config['allow_birthdays']) @@ -343,7 +339,6 @@ class ucp_profile 'user_msnm' => $data['msn'], 'user_yim' => $data['yim'], 'user_jabber' => $data['jabber'], - 'user_website' => $data['website'], 'user_notify_type' => $data['notify'], ); @@ -410,7 +405,6 @@ class ucp_profile 'AIM' => $data['aim'], 'MSN' => $data['msn'], 'JABBER' => $data['jabber'], - 'WEBSITE' => $data['website'], )); // Get additional profile fields and assign them to the template block var 'profile_fields' |