diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-02-02 15:41:49 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-02-06 11:32:06 +0100 |
| commit | 3c640e57c5815c970e706f724fb29a3114826352 (patch) | |
| tree | 1a707ce2f7c51c60ff289c0cb5cb0cfd9705edc1 /phpBB/includes/ucp | |
| parent | 344baf91809bbfd5a224191e13472b94f77b421c (diff) | |
| download | forums-3c640e57c5815c970e706f724fb29a3114826352.tar forums-3c640e57c5815c970e706f724fb29a3114826352.tar.gz forums-3c640e57c5815c970e706f724fb29a3114826352.tar.bz2 forums-3c640e57c5815c970e706f724fb29a3114826352.tar.xz forums-3c640e57c5815c970e706f724fb29a3114826352.zip | |
[ticket/12115] Convert user occupation to a profile field
PHPBB3-12115
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_main.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index b9f951ace6..90f03a970a 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -195,7 +195,6 @@ class ucp_main 'POSTS_DAY' => $user->lang('POST_DAY', $posts_per_day), 'POSTS_PCT' => $user->lang('POST_PCT', $percentage), - 'OCCUPATION' => (!empty($row['user_occ'])) ? $row['user_occ'] : '', 'INTERESTS' => (!empty($row['user_interests'])) ? $row['user_interests'] : '', // 'S_GROUP_OPTIONS' => $group_options, diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 6ddc6833b7..dc7547239b 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -271,7 +271,6 @@ class ucp_profile 'jabber' => utf8_normalize_nfc(request_var('jabber', $user->data['user_jabber'], true)), 'website' => request_var('website', $user->data['user_website']), 'location' => utf8_normalize_nfc(request_var('location', $user->data['user_from'], true)), - 'occupation' => utf8_normalize_nfc(request_var('occupation', $user->data['user_occ'], true)), 'interests' => utf8_normalize_nfc(request_var('interests', $user->data['user_interests'], true)), ); @@ -308,7 +307,6 @@ class ucp_profile array('string', true, 12, 255), array('match', true, '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')), 'location' => array('string', true, 2, 100), - 'occupation' => array('string', true, 2, 500), 'interests' => array('string', true, 2, 500), ); @@ -356,7 +354,6 @@ class ucp_profile 'user_jabber' => $data['jabber'], 'user_website' => $data['website'], 'user_from' => $data['location'], - 'user_occ' => $data['occupation'], 'user_interests'=> $data['interests'], 'user_notify_type' => $data['notify'], ); @@ -427,7 +424,6 @@ class ucp_profile 'JABBER' => $data['jabber'], 'WEBSITE' => $data['website'], 'LOCATION' => $data['location'], - 'OCCUPATION'=> $data['occupation'], 'INTERESTS' => $data['interests'], )); |