diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-02-10 13:52:12 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-02-10 13:52:12 +0100 |
| commit | 840ab75520726e4db689ab1a92de6c17d86b107b (patch) | |
| tree | 887704c33fe0ebebbceceee0544969e0ff1f631b /phpBB/includes/ucp/ucp_profile.php | |
| parent | 02674de89367895642b57450b5444ab23488ab9b (diff) | |
| parent | 4663ea7c8288ae56e00e2270aee49cb14a7c0276 (diff) | |
| download | forums-840ab75520726e4db689ab1a92de6c17d86b107b.tar forums-840ab75520726e4db689ab1a92de6c17d86b107b.tar.gz forums-840ab75520726e4db689ab1a92de6c17d86b107b.tar.bz2 forums-840ab75520726e4db689ab1a92de6c17d86b107b.tar.xz forums-840ab75520726e4db689ab1a92de6c17d86b107b.zip | |
Merge pull request #1988 from nickvergessen/ticket/12115
[ticket/12115] Convert occupation profile field to custom field
Diffstat (limited to 'phpBB/includes/ucp/ucp_profile.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 6ddc6833b7..22b180ba89 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -271,8 +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)), ); if ($config['allow_birthdays']) @@ -308,8 +306,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), ); if ($config['allow_birthdays']) @@ -356,8 +352,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,8 +421,6 @@ class ucp_profile 'JABBER' => $data['jabber'], 'WEBSITE' => $data['website'], 'LOCATION' => $data['location'], - 'OCCUPATION'=> $data['occupation'], - 'INTERESTS' => $data['interests'], )); // Get additional profile fields and assign them to the template block var 'profile_fields' |