aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-02-02 15:41:49 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-02-06 11:32:06 +0100
commit3c640e57c5815c970e706f724fb29a3114826352 (patch)
tree1a707ce2f7c51c60ff289c0cb5cb0cfd9705edc1 /phpBB/includes/acp
parent344baf91809bbfd5a224191e13472b94f77b421c (diff)
downloadforums-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/acp')
-rw-r--r--phpBB/includes/acp/acp_users.php4
1 files changed, 0 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index bf11e4f8fe..d9c8ee42ae 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1368,7 +1368,6 @@ class acp_users
'jabber' => utf8_normalize_nfc(request_var('jabber', $user_row['user_jabber'], true)),
'website' => request_var('website', $user_row['user_website']),
'location' => utf8_normalize_nfc(request_var('location', $user_row['user_from'], true)),
- 'occupation' => utf8_normalize_nfc(request_var('occupation', $user_row['user_occ'], true)),
'interests' => utf8_normalize_nfc(request_var('interests', $user_row['user_interests'], true)),
'bday_day' => 0,
'bday_month' => 0,
@@ -1402,7 +1401,6 @@ class acp_users
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),
'bday_day' => array('num', true, 1, 31),
'bday_month' => array('num', true, 1, 12),
@@ -1432,7 +1430,6 @@ class acp_users
'user_jabber' => $data['jabber'],
'user_website' => $data['website'],
'user_from' => $data['location'],
- 'user_occ' => $data['occupation'],
'user_interests'=> $data['interests'],
'user_birthday' => $data['user_birthday'],
);
@@ -1484,7 +1481,6 @@ class acp_users
'JABBER' => $data['jabber'],
'WEBSITE' => $data['website'],
'LOCATION' => $data['location'],
- 'OCCUPATION' => $data['occupation'],
'INTERESTS' => $data['interests'],
'S_BIRTHDAY_DAY_OPTIONS' => $s_birthday_day_options,